Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Changed handlers (both mod_python and WSGI) to support setting multip…

…le cookies per request

git-svn-id: http://code.djangoproject.com/svn/django/trunk@511 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d22e88898fdd4d60d481e17f726d5b134ddc1daf 1 parent c727729
@adrianholovaty adrianholovaty authored
View
4 django/core/handlers/modpython.py
@@ -164,11 +164,11 @@ def __call__(self, req):
def populate_apache_request(http_response, mod_python_req):
"Populates the mod_python request object with an HttpResponse"
mod_python_req.content_type = http_response['Content-Type'] or httpwrappers.DEFAULT_MIME_TYPE
- if http_response.cookies:
- mod_python_req.headers_out['Set-Cookie'] = http_response.cookies.output(header='')
for key, value in http_response.headers.items():
if key != 'Content-Type':
mod_python_req.headers_out[key] = value
+ for c in http_response.cookies.values():
+ mod_python_req.headers_out.add('Set-Cookie', c.output(header=''))
mod_python_req.status = http_response.status_code
mod_python_req.write(http_response.get_content_as_string('utf-8'))
View
8 django/core/handlers/wsgi.py
@@ -138,9 +138,9 @@ def __call__(self, environ, start_response):
except KeyError:
status_text = 'UNKNOWN STATUS CODE'
status = '%s %s' % (response.status_code, status_text)
- response_headers = response.headers
- if response.cookies:
- response_headers['Set-Cookie'] = response.cookies.output(header='')
+ response_headers = response.headers.items()
+ for c in response.cookies.values():
+ response_headers.append(('Set-Cookie', c.output(header='')))
output = [response.get_content_as_string('utf-8')]
- start_response(status, response_headers.items())
+ start_response(status, response_headers)
return output
Please sign in to comment.
Something went wrong with that request. Please try again.