Update RFC reference and some minor code fixes

python · lyc8503 · May 11, 2024 · May 23, 2024 · May 23, 2024 · May 23, 2024
commit 77436b38269ad975a026ab7926f46a4aacc8d88c
diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
@@ -336,7 +336,7 @@ provides three different variants:
 
    .. versionchanged:: next
       Added support for HTTP single-part range requests on files, as specified
-      in :rfc:`7233`.
+      in :rfc:`9110#section-14`.
 
    A lot of the work, such as parsing the request, is done by the base class
    :class:`BaseHTTPRequestHandler`.  This class implements the :func:`do_GET`

diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst
@@ -409,9 +409,11 @@ http
   (Contributed by Yorik Hansen in :gh:`123430`.)
 
 * Added support for HTTP single-part range requests on files to
-  :class:`~http.server.SimpleHTTPRequestHandler`, as specified in :rfc:`7233`.
+  :class:`~http.server.SimpleHTTPRequestHandler`, as specified in
+  :rfc:`9110#section-14`.
   (Contributed by Andy Ling in :gh:`86809`.)
 
+
 inspect
 -------
 

diff --git a/Lib/http/server.py b/Lib/http/server.py
@@ -132,7 +132,7 @@
 """
 
 DEFAULT_ERROR_CONTENT_TYPE = "text/html;charset=utf-8"
-RANGE_REGEX_PATTERN = re.compile(r'bytes=(\d*)-(\d*)$', re.IGNORECASE)
+RANGE_REGEX_PATTERN = re.compile(r'bytes=(\d*)-(\d*)$', re.IGNORECASE | re.ASCII)
 
 class HTTPServer(socketserver.TCPServer):
 
@@ -779,6 +779,8 @@ def send_head(self):
                 start, end = self._range
                 if start is None:
                     # `end` here means suffix length
+                    # parse_range() collapses (None, None) to None
+                    # and thus `end` can not be None here
                     start = max(0, fs.st_size - end)
                     end = fs.st_size - 1
                 if start >= fs.st_size:
@@ -791,7 +793,7 @@ def send_head(self):
                 if end is None or end >= fs.st_size:
                     end = fs.st_size - 1
                 self.send_response(HTTPStatus.PARTIAL_CONTENT)
-                self.send_header("Content-Range", "bytes %s-%s/%s" % (start, end, fs.st_size))
+                self.send_header("Content-Range", f"bytes {start}-{end}/{fs.st_size}")
                 self.send_header("Content-Length", str(end - start + 1))
 
                 # Update range to be sent to be used later in copyfile

diff --git a/Misc/NEWS.d/next/Library/2024-05-12-00-15-44.gh-issue-86809._5vdGa.rst b/Misc/NEWS.d/next/Library/2024-05-12-00-15-44.gh-issue-86809._5vdGa.rst
@@ -1 +1 @@
-Added support for HTTP single-part range requests on files to :class:`~http.server.SimpleHTTPRequestHandler`, as specified in :rfc:`7233`.
+Added support for HTTP single-part range requests on files to :class:`~http.server.SimpleHTTPRequestHandler`, as specified in :rfc:`9110#section-14`.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Added support for HTTP single-part range requests on files to :class:`~http.server.SimpleHTTPRequestHandler`, as specified in :rfc:`7233`.
		Added support for HTTP single-part range requests on files to :class:`~http.server.SimpleHTTPRequestHandler`, as specified in :rfc:`9110#section-14`.