Browse Source

Merge "Strip two more accept headers from object-storage"

tags/0.36.0
Zuul 1 week ago
parent
commit
f56d7b9a29

+ 2
- 4
openstack/object_store/v1/obj.py View File

@@ -269,7 +269,6 @@ class Object(_base.BaseResource):
269 269
 
270 270
     def _download(self, session, error_message=None, stream=False):
271 271
         request = self._prepare_request()
272
-        request.headers['Accept'] = 'bytes'
273 272
 
274 273
         response = session.get(
275 274
             request.url, headers=request.headers, stream=stream)
@@ -307,9 +306,8 @@ class Object(_base.BaseResource):
307 306
             # Fetch metadata to determine SLO flag
308 307
             self.head(session)
309 308
 
310
-        headers = {
311
-            'Accept': ""
312
-        }
309
+        headers = {}
310
+
313 311
         if self.is_static_large_object:
314 312
             headers['multipart-manifest'] = 'delete'
315 313
 

+ 1
- 1
openstack/tests/unit/object_store/v1/test_obj.py View File

@@ -105,7 +105,7 @@ class TestObject(base_test_object.BaseTestObject):
105 105
         headers = {
106 106
             'X-Newest': 'True',
107 107
             'If-Match': self.headers['Etag'],
108
-            'Accept': 'bytes'
108
+            'Accept': '*/*'
109 109
         }
110 110
         self.register_uris([
111 111
             dict(method='GET', uri=self.object_endpoint,

Loading…
Cancel
Save