kennethreitz/httpbin
1
0
Fork 0
mirror of https://github.com/kennethreitz/httpbin.git synced 2026-06-05 23:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #346 from nateprewitt/range_content_length

Browse Source 
fix Content-Length header values for /range endpoint
This commit is contained in:
Nate Prewitt
2017-03-30 10:37:05 -06:00
committed by GitHub
parent 7dc2417f9c b64036b316
commit ef4f34adc9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
httpbin/core.py
+3 -2
View File
@@ -618,13 +618,14 @@ def range_request(numbytes):
request_headers = get_headers()
first_byte_pos, last_byte_pos = get_request_range(request_headers, numbytes)
range_length = (last_byte_pos+1) - first_byte_pos
if first_byte_pos > last_byte_pos or first_byte_pos not in xrange(0, numbytes) or last_byte_pos not in xrange(0, numbytes):
response = Response(headers={
'ETag' : 'range%d' % numbytes,
'Accept-Ranges' : 'bytes',
'Content-Range' : 'bytes */%d' % numbytes,
"Content-Length": str(numbytes),
'Content-Length': '0',
})
response.status_code = 416
return response
@@ -651,7 +652,7 @@ def range_request(numbytes):
'Content-Type': 'application/octet-stream',
'ETag' : 'range%d' % numbytes,
'Accept-Ranges' : 'bytes',
"Content-Length": str(numbytes),
'Content-Length': str(range_length),
'Content-Range' : content_range
}
test_httpbin.py
+4
View File
@@ -486,6 +486,7 @@ class HttpbinTestCase(unittest.TestCase):
self.assertEqual(response.headers.get('ETag'), 'range100')
self.assertEqual(response.headers.get('Content-range'), 'bytes 10-24/100')
self.assertEqual(response.headers.get('Accept-ranges'), 'bytes')
self.assertEqual(response.headers.get('Content-Length'), '15')
self.assertEqual(self.get_data(response), 'klmnopqrstuvwxy'.encode('utf8'))
def test_request_range_first_15_bytes(self):
@@ -509,6 +510,7 @@ class HttpbinTestCase(unittest.TestCase):
self.assertEqual(response.headers.get('ETag'), 'range26')
self.assertEqual(self.get_data(response), 'uvwxyz'.encode('utf8'))
self.assertEqual(response.headers.get('Content-range'), 'bytes 20-25/26')
self.assertEqual(response.headers.get('Content-Length'), '6')
def test_request_range_suffix(self):
response = self.app.get(
@@ -520,6 +522,7 @@ class HttpbinTestCase(unittest.TestCase):
self.assertEqual(response.headers.get('ETag'), 'range26')
self.assertEqual(self.get_data(response), 'vwxyz'.encode('utf8'))
self.assertEqual(response.headers.get('Content-range'), 'bytes 21-25/26')
self.assertEqual(response.headers.get('Content-Length'), '5')
def test_request_out_of_bounds(self):
response = self.app.get(
@@ -532,6 +535,7 @@ class HttpbinTestCase(unittest.TestCase):
self.assertEqual(response.headers.get('ETag'), 'range26')
self.assertEqual(len(self.get_data(response)), 0)
self.assertEqual(response.headers.get('Content-range'), 'bytes */26')
self.assertEqual(response.headers.get('Content-Length'), '0')
response = self.app.get(
'/range/26',