diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2006-09-14 15:37:11 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2006-09-14 15:37:11 +0000 |
| commit | 927ec3fe7b446079d169ce684f833800bc117b74 (patch) | |
| tree | 859e9d8ce6caff920f33d6ec0a88aa5f24ac29ea | |
| parent | 45399b4b13928e7616d4d1b2e8859d6ef9a865c7 (diff) | |
Fixed #2732 -- Fixed error in FastCGI docs and added keyword-arg support in a FastCGI function. Thanks for the patch, James Crasta
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/core/servers/fastcgi.py | 3 | ||||
| -rw-r--r-- | docs/fastcgi.txt | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/django/core/servers/fastcgi.py b/django/core/servers/fastcgi.py index dedc1f8ba1..7377bed1c5 100644 --- a/django/core/servers/fastcgi.py +++ b/django/core/servers/fastcgi.py @@ -74,8 +74,9 @@ def fastcgi_help(message=None): print message return False -def runfastcgi(argset): +def runfastcgi(argset, **kwargs): options = FASTCGI_OPTIONS.copy() + options.update(kwargs) for x in argset: if "=" in x: k, v = x.split('=', 1) diff --git a/docs/fastcgi.txt b/docs/fastcgi.txt index 41d50d97a1..e2f4e933b4 100644 --- a/docs/fastcgi.txt +++ b/docs/fastcgi.txt @@ -270,7 +270,7 @@ In your Web root directory, add this to a file named ``.htaccess`` :: AddHandler fastcgi-script .fcgi RewriteEngine On RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^/(.*)$ /mysite.fcgi/$1 [QSA,L] + RewriteRule ^(.*)$ mysite.fcgi/$1 [QSA,L] Then, create a small script that tells Apache how to spawn your FastCGI program. Create a file ``mysite.fcgi`` and place it in your Web directory, and @@ -289,7 +289,7 @@ be sure to make it executable :: os.environ['DJANGO_SETTINGS_MODULE'] = "myproject.settings" from django.core.servers.fastcgi import runfastcgi - runfastcgi(["method=threaded", "daemonize=false"]) + runfastcgi(method="threaded", daemonize="false") Restarting the spawned server ----------------------------- |