openstack
/
glance
Code Issues Proposed changes

Omit Content-Length on chunked transfer 

Content-Length and Transfer-Encoding conflict according to the HTTP
spec. This fixes bug 981332.

[ This is backported from 223fbee49a ]

Change-Id: I62f2bcabd9712361dd8837e39a577c4add052d0f
This commit is contained in:
Mike Lundy 2012-04-13 19:53:16 -07:00
parent 871ea1eb38
commit bad506d840
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glance/common/client.py
View File

@ -198,8 +198,12 @@ class BaseClient(object):
# Chunk it, baby...
c.putrequest(method, action)
# According to HTTP/1.1, Content-Length and Transfer-Encoding
# conflict.
for header, value in headers.items():
c.putheader(header, value)
if header.lower() != 'content-length':
c.putheader(header, value)
c.putheader('Transfer-Encoding', 'chunked')
c.endheaders()

9
glance/tests/stubs.py
View File

@ -95,7 +95,7 @@ def stub_out_registry_and_store_server(stubs):
def close(self):
return True
def request(self, method, url, body=None, headers={}):
def request(self, method, url, body=None, headers=None):
self.req = webob.Request.blank("/" + url.lstrip("/"))
self.req.method = method
if headers:
@ -138,7 +138,10 @@ def stub_out_registry_and_store_server(stubs):
self.req.headers[key] = value
def endheaders(self):
pass
hl = [i.lower() for i in self.req.headers.keys()]
assert not ('content-length' in hl and
'transfer-encoding' in hl), \
'Content-Length and Transfer-Encoding are mutually exclusive'
def send(self, data):
# send() is called during chunked-transfer encoding, and
@ -146,7 +149,7 @@ def stub_out_registry_and_store_server(stubs):
# only write the actual data in tests.
self.req.body += data.split("\r\n")[1]
def request(self, method, url, body=None, headers={}):
def request(self, method, url, body=None, headers=None):
self.req = webob.Request.blank("/" + url.lstrip("/"))
self.req.method = method
if headers: