Send content-range when not satisfiable

python · lyc8503 · May 11, 2024 · May 23, 2024 · May 23, 2024 · May 23, 2024
commit 2824b9cc7f2f669deafdefec55ecdf7a17d0b717
diff --git a/Lib/http/server.py b/Lib/http/server.py
@@ -445,7 +445,7 @@ def handle(self):
         while not self.close_connection:
             self.handle_one_request()
 
-    def send_error(self, code, message=None, explain=None):
+    def send_error(self, code, message=None, explain=None, *, range_size=None):
         """Send and log an error reply.
 
         Arguments are
@@ -456,6 +456,7 @@ def send_error(self, code, message=None, explain=None):
                    defaults to short entry matching the response code
         * explain: a detailed message defaults to the long entry
                    matching the response code.
+        * range_size: file size for use in content-range header
 
         This sends an error response (so it must be called before any
         output has been generated), logs the error, and finally sends
@@ -493,6 +494,8 @@ def send_error(self, code, message=None, explain=None):
             body = content.encode('UTF-8', 'replace')
             self.send_header("Content-Type", self.error_content_type)
             self.send_header('Content-Length', str(len(body)))
+        if code == HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE and range_size:
+            self.send_header('Content-Range', f'bytes */{range_size}')
         self.end_headers()
 
         if self.command != 'HEAD' and body:
@@ -783,7 +786,7 @@ def send_head(self):
                     # none of the range values overlap the extent of
                     # the resource
                     f.close()
-                    self.send_error(HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
+                    self.send_error(HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE, range_size=fs.st_size)
                     return None
                 if end is None or end >= fs.st_size:
                     end = fs.st_size - 1

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
@@ -574,6 +574,7 @@ def test_range_get(self):
 
         # invalid ranges
         response = self.request(route, headers={'Range': 'bytes=100-200'})
+        self.assertEqual(response.getheader('content-range'), 'bytes */30')
         self.check_status_and_reason(response, HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
 
         response = self.request(route, headers={'Range': 'bytes=4-3'})