pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't accidentally include a newline from the mime headers in the parsed multipart data

Browse source 
Fixes #680
This commit is contained in:
Gina Häußge 2014-12-19 12:28:02 +01:00
parent 1180cac147
commit 8998be66eb
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/octoprint/server/util/tornado.py
View file

@ -194,7 +194,8 @@ class UploadStorageFallbackHandler(tornado.web.RequestHandler):
end_of_header = None
if delimiter_loc != -1:
# found the delimiter in the currently available data
data, self._buffer = data[0:delimiter_loc], data[delimiter_loc:]
delimiter_data_end = 0 if delimiter_loc == 0 else delimiter_loc - 2
data, self._buffer = data[0:delimiter_data_end], data[delimiter_loc:]
end_of_header = self._buffer.find("\r\n\r\n")
else:
# make sure any boundary (with single or double ==) contained at the end of chunk does not get
@ -339,7 +340,7 @@ class UploadStorageFallbackHandler(tornado.web.RequestHandler):
if "content_type" in part and part["content_type"] is not None:
self._new_body += b"Content-Type: %s\r\n" % part["content_type"]
self._new_body += b"\r\n"
self._new_body += value
self._new_body += value + b"\r\n"
self._new_body += b"--%s--\r\n" % self._multipart_boundary
def _handle_method(self, *args, **kwargs):