Changeset 7836 for django/branches/gis/django/core/servers

Timestamp:

07/04/08 15:16:22 (6 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7772-7808,7811-7814,7816-7823,7826-7829,7831-7833,7835 via svnmerge from trunk. Modified GeoWhereNode accordingly for changes in r7835.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/core/servers/basehttp.py (modified) (1 diff)
• django/branches/gis/django/core/servers/fastcgi.py (modified) (3 diffs)

django/branches/gis/django/core/servers/basehttp.py

@@ -552 +552 @@
-        from django.conf import settings
-        self.admin_media_prefix = settings.ADMIN_MEDIA_PREFIX
+        # We set self.path to avoid crashes in log_message() on unsupported
+        # requests (like "OPTIONS").
+        self.path = ''
-        BaseHTTPRequestHandler.__init__(self, *args, **kwargs)
-

django/branches/gis/django/core/servers/fastcgi.py

@@ -41 +41 @@
-  outlog=FILE          write stdout to this file.
-  errlog=FILE          write stderr to this file.
+  umask=UMASK          umask to use when daemonizing (default 022).
-
-Examples:
@@ -74 +75 @@
-    'outlog': None,
-    'errlog': None,
+    'umask': None,
-}
-
@@ -160 +162 @@
-    if options['errlog']:
-        daemon_kwargs['err_log'] = options['errlog']
+    if options['umask']:
+        daemon_kwargs['umask'] = int(options['umask'])
-
-    if daemonize: