diff options
| author | Jason Pellerin <jpellerin@gmail.com> | 2006-11-29 19:51:54 +0000 |
|---|---|---|
| committer | Jason Pellerin <jpellerin@gmail.com> | 2006-11-29 19:51:54 +0000 |
| commit | f6d48b5d02acc7cd8d71ffe895fbf41c7c9ae2b7 (patch) | |
| tree | e917b17718dc2bec225e37d9f452cfd734c5ef6a /django | |
| parent | c000f6a48061839d064143be45d2453b5cf97311 (diff) | |
[multi-db] Merge trunk to [3764]. Some tests still failing.
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@4138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/servers/fastcgi.py | 3 |
1 files changed, 2 insertions, 1 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) |