summaryrefslogtreecommitdiff
path: root/django/conf
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-07-21 07:57:10 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-07-21 07:57:10 +0000
commitbfcecbffd37a68b5fffe81954c17aedeacb1ba22 (patch)
treef838d3d4ad950943936f2e93b353f2dd9542c6fd /django/conf
parentca7ee4be17b9b3d80559de00c7bcbcafb188d4f1 (diff)
Changed/fixed the way Django handles SCRIPT_NAME and PATH_INFO (or
equivalents). Basically, URL resolving will only use the PATH_INFO and the SCRIPT_NAME will be prepended by reverse() automatically. Allows for more portable development and installation. Also exposes SCRIPT_NAME in the HttpRequest instance. There are a number of cases where things don't work completely transparently, so mod_python and fastcgi users should read the relevant docs. Fixed #285, #1516, #3414. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/conf')
-rw-r--r--django/conf/global_settings.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 2c9720da10..797841d297 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -188,6 +188,9 @@ APPEND_SLASH = True
# Whether to prepend the "www." subdomain to URLs that don't have it.
PREPEND_WWW = False
+# Override the server-derived value of SCRIPT_NAME
+FORCE_SCRIPT_NAME = None
+
# List of compiled regular expression objects representing User-Agent strings
# that are not allowed to visit any page, systemwide. Use this for bad
# robots/crawlers. Here are a few examples: