Ticket #3357: threading.3.patch

./django/conf/global_settings.py

@@ -133 +133 @@
 EMAIL_HOST_PASSWORD = ''
 EMAIL_USE_TLS = False
 
+# Whether to use a multi-threaded development server.
+USE_MULTITHREADED_SERVER = False 
+
 # List of strings representing installed apps.
 INSTALLED_APPS = ()
 

./django/core/servers/basehttp.py

@@ -7 +7 @@
 been reviewed for security issues. Don't use it for production use.
 """
 
-from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+from django.conf import settings 
+from BaseHTTPServer import BaseHTTPRequestHandler
 import mimetypes
 import os
 import re
@@ -16 +17 @@
 
 from django.utils.http import http_date
 
+if settings.USE_MULTITHREADED_SERVER: 
+    # This creates a base HTTPServer class that supports multithreading 
+    import BaseHTTPServer, SocketServer 
+    class HTTPServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer): 
+        def __init__(self, server_address, RequestHandlerClass=None): 
+            BaseHTTPServer.HTTPServer.__init__(self, server_address, RequestHandlerClass) 
+else: 
+    from BaseHTTPServer import HTTPServer 
+
 __version__ = "0.1"
 __all__ = ['WSGIServer','WSGIRequestHandler','demo_app']
 

./docs/settings.txt

@@ -1117 +1117 @@
 set to ``False``, Django will make some optimizations so as not to load the
 internationalization machinery.
 
+USE_MULTITHREADED_SERVER 
+------------------------ 
+ 
+**New in Django development version** 
+ 
+Default: ``False`` 
+ 
+A boolean that specifies whether Django's built-in development server 
+should run multi-threaded.  Caution should be taken when setting this to 
+True so as to avoid multi-threading bugs in your views.
+
 YEAR_MONTH_FORMAT
 -----------------