--- a/components/openstack/glance/patches/03-Partial_Content.patch Mon May 16 14:46:20 2016 +0200
+++ b/components/openstack/glance/patches/03-Partial_Content.patch Fri May 20 17:42:29 2016 -0400
@@ -5,9 +5,9 @@
https://bugs.launchpad.net/glance/+bug/1399851
https://bugs.launchpad.net/glance/+bug/1417069
---- glance-2014.2.2/glance/api/v2/image_data.py.~1~ 2015-02-05 07:19:44.000000000 -0800
-+++ glance-2014.2.2/glance/api/v2/image_data.py 2015-02-23 14:04:17.091921881 -0800
-@@ -199,6 +199,8 @@ class ResponseSerializer(wsgi.JSONRespon
+--- glance-2015.1.2/glance/api/v2/image_data.py.~1~ 2015-10-13 09:38:23.000000000 -0700
++++ glance-2015.1.2/glance/api/v2/image_data.py 2016-01-19 12:23:11.296863244 -0800
+@@ -211,6 +211,8 @@ class ResponseSerializer(wsgi.JSONRespon
def download(self, response, image):
offset, chunk_size = 0, None
@@ -16,7 +16,7 @@
range_val = response.request.get_content_range()
if range_val:
-@@ -210,6 +212,21 @@ class ResponseSerializer(wsgi.JSONRespon
+@@ -222,6 +224,21 @@ class ResponseSerializer(wsgi.JSONRespon
if range_val.stop is not None:
chunk_size = range_val.stop - offset
@@ -38,9 +38,9 @@
response.headers['Content-Type'] = 'application/octet-stream'
try:
-@@ -229,7 +246,9 @@ class ResponseSerializer(wsgi.JSONRespon
+@@ -246,7 +263,9 @@ class ResponseSerializer(wsgi.JSONRespon
response.headers['Content-MD5'] = image.checksum
- #NOTE(markwash): "response.app_iter = ..." also erroneously resets the
+ # NOTE(markwash): "response.app_iter = ..." also erroneously resets the
# content-length
- response.headers['Content-Length'] = str(image.size)
+ # NOTE(mattk): Should be set to chunk_size or image.size
@@ -49,9 +49,9 @@
def upload(self, response, result):
response.status_int = 204
---- glance-2014.2.2/glance/common/wsgi.py.~1~ 2015-02-05 07:19:44.000000000 -0800
-+++ glance-2014.2.2/glance/common/wsgi.py 2015-02-23 14:04:17.092284573 -0800
-@@ -556,7 +556,7 @@ class Request(webob.Request):
+--- glance-2015.1.2/glance/common/wsgi.py.~1~ 2015-10-13 09:38:23.000000000 -0700
++++ glance-2015.1.2/glance/common/wsgi.py 2016-01-19 12:23:11.297682604 -0800
+@@ -752,7 +752,7 @@ class Request(webob.Request):
return self.accept_language.best_match(langs)
def get_content_range(self):
@@ -60,7 +60,7 @@
range_str = self.headers.get('Content-Range')
if range_str is not None:
range_ = webob.byterange.ContentRange.parse(range_str)
-@@ -565,6 +565,16 @@ class Request(webob.Request):
+@@ -761,6 +761,16 @@ class Request(webob.Request):
raise webob.exc.HTTPBadRequest(explanation=msg)
return range_
@@ -76,4 +76,4 @@
+
class JSONRequestDeserializer(object):
- def has_body(self, request):
+ valid_transfer_encoding = frozenset(['chunked', 'compress', 'deflate',