openstack/python-swiftclient
Code Issues Proposed changes

Remove multipart/form-data file upload

Browse Source 
The requests 'files' parameter adds this 'Content-Type: multipart/form-data'
HTTP header and the whole multipart body data get stored with the object.
This also create a memory hog issue because files are loaded in memory before
being actually sent. This patch removes this behavior and restores what was
done before, ie: direct uploading.

This patches also fixes an issue in requests, when used with glance
CooperativeReader it mis-calculates content-length leading to chunked encoding
for raw upload.

Change-Id: Ie5b0a1078bedd33f09c6157f48b5f88116c589fa
Closes-Bug: #1280072
Closes-Bug: #1280275
This commit is contained in:
Tristan Cacqueray
2014-02-14 12:52:26 +01:00
parent 79f189a593
commit 380e830874
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
swiftclient/client.py
View File

@@ -935,7 +935,12 @@ def put_object(url, token=None, container=None, name=None, contents=None,
yield data yield data
conn.putrequest(path, headers=headers, data=chunk_reader()) conn.putrequest(path, headers=headers, data=chunk_reader())
else: else:
conn.putrequest(path, headers=headers, files={"file": contents}) # Fixes https://github.com/kennethreitz/requests/issues/1648
try:
contents.len = content_length
except AttributeError:
pass
conn.putrequest(path, headers=headers, data=contents)
else: else:
if chunk_size is not None: if chunk_size is not None:
warn_msg = '%s object has no \"read\" method, ignoring chunk_size'\ warn_msg = '%s object has no \"read\" method, ignoring chunk_size'\