python · PierreQuentel · Jun 9, 2017 · Jun 9, 2017 · Jun 9, 2017 · Jun 9, 2017
diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
@@ -275,7 +275,6 @@ provides three different variants:
       the message to :meth:`log_message`, so it takes the same arguments
       (*format* and additional values).
 
-
    .. method:: log_message(format, ...)
 
       Logs an arbitrary message to ``sys.stderr``. This is typically overridden
@@ -338,6 +337,29 @@ provides three different variants:
 
       If not specified, the directory to serve is the current working directory.
 
+   .. attribute:: compressed_types
+
+      The list of content types for which HTTP compression is applied. Set by
+      default to the empty list, which means that by default, compression is
+      disabled. It can be set to a list of types, for instance :
+      ``["text/plain", "text/html", "text/css"]``. A list of commonly
+      compressed types is provided as ``commonly_compressed_types`` at the
+      module level.
+
+      .. versionadded:: 3.7
+
+   .. attribute:: compressions
+
+      A mapping between a compression encoding (eg. "gzip") and a generator
+      that takes a file object as an argument, reads the file content by
+      chunks, compresses each chunk with the specified encoding, and yields
+      the compressed data as a bytes object.
+      By default, if the :mod:`zlib` module is available, "gzip" and "deflate"
+      compressions are supported. To support other algorithms,
+      :attr:`compressions` can be extended.
+
+      .. versionadded:: 3.7
+
    The :class:`SimpleHTTPRequestHandler` class defines the following methods:
 
    .. method:: do_HEAD()
@@ -366,6 +388,12 @@ provides three different variants:
       type is guessed by calling the :meth:`guess_type` method, which in turn
       uses the *extensions_map* variable, and the file contents are returned.
 
+      If the content type is in the list ``compressed_types``, and if the
+      user agent has sent an ``'Accept-Encoding'`` header that included
+      "gzip", a header ``'Content-Encoding'`` set to "gzip" is sent and the
+      file content is compressed using gzip. For big files, the gzipped
+      content is stored in a temporary file.
+
       A ``'Content-type:'`` header with the guessed content type is output,
       followed by a ``'Content-Length:'`` header with the file's size and a
       ``'Last-Modified:'`` header with the file's modification time.
@@ -377,8 +405,9 @@ provides three different variants:
       For example usage, see the implementation of the :func:`test` function
       invocation in the :mod:`http.server` module.
 
-      .. versionchanged:: 3.7
-         Support of the ``'If-Modified-Since'`` header.
+      .. versionadded:: 3.7
+         Support of the ``'If-Modified-Since'`` header and of HTTP
+         compression.
 
 The :class:`SimpleHTTPRequestHandler` class can be used in the following
 manner in order to create a very basic webserver serving files relative to
@@ -421,6 +450,12 @@ the following command uses a specific directory::
 .. versionadded:: 3.7
     ``--directory`` specify alternate directory
 
+By default, HTTP compression is not supported. Setting the option
+``--compressed`` enables compression on the content types defined in
+``commonly_compressed_types``.
+
+.. versionadded:: 3.7
+
 .. class:: CGIHTTPRequestHandler(request, client_address, server)
 
    This class is used to serve either files or output of CGI scripts from the

diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
@@ -962,6 +962,16 @@ With this parameter, the server serves the specified directory, by default it
 uses the current working directory.
 (Contributed by Stéphane Wirtel and Julien Palard in :issue:`28707`.)
 
+Support HTTP compression : if the user agent sends a request with header
+``Accept-Encoding`` including gzip, and if the content type guessed from the
+file extension is in the attribute ``compressed_types`` of
+:class:`~http.server.SimpleHTTPRequestHandler`, set the response header
+``Content-Encoding`` to "gzip", set ``Content-Length`` to the length of the
+gzipped content, and return a file object with the gzipped content.
+(Contributed by Pierre Quentel in :issue:`30576`.)
+
+hmac
+=======
 The new :class:`ThreadingHTTPServer <http.server.ThreadingHTTPServer>` class
 uses threads to handle requests using :class:`~socketserver.ThreadingMixin`.
 It is used when ``http.server`` is run with ``-m``.
@@ -1085,6 +1095,7 @@ configuration passed to :func:`logging.config.fileConfig`.
 
 
 math
+
 ----
 
 The new :func:`math.remainder` function implements the IEEE 754-style remainder
@@ -1099,7 +1110,10 @@ The MIME type of .bmp has been changed from ``'image/x-ms-bmp'`` to
 (Contributed by Nitish Chandra in :issue:`22589`.)
 
 
+locale
+=======
 msilib
+
 ------
 
 The new :meth:`Database.Close() <msilib.Database.Close>` method can be used

diff --git a/Lib/cgi.py b/Lib/cgi.py
@@ -140,7 +140,7 @@ def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0):
 
     # field keys and values (except for files) are returned as strings
     # an encoding is required to decode the bytes read from self.fp
-    if hasattr(fp,'encoding'):
+    if hasattr(fp, 'encoding'):
         encoding = fp.encoding
     else:
         encoding = 'latin-1'
@@ -202,7 +202,7 @@ def parse_multipart(fp, pdict, encoding="utf-8", errors="replace"):
     headers.set_type(ctype)
     headers['Content-Length'] = pdict['CONTENT-LENGTH']
     fs = FieldStorage(fp, headers=headers, encoding=encoding, errors=errors,
-        environ={'REQUEST_METHOD': 'POST'})
+                      environ={'REQUEST_METHOD': 'POST'})
     return {k: fs.getlist(k) for k in fs}
 
 def _parseparam(s):
@@ -259,7 +259,6 @@ def __init__(self, name, value):
         """Constructor from field name and value."""
         self.name = name
         self.value = value
-        # self.file = StringIO(value)
 
     def __repr__(self):
         """Return printable representation."""
@@ -456,7 +455,7 @@ def __init__(self, fp=None, headers=None, outerboundary=b'',
             if maxlen and clen > maxlen:
                 raise ValueError('Maximum content length exceeded')
         self.length = clen
-        if self.limit is None and clen:
+        if self.limit is None and clen >= 0:
             self.limit = clen
 
         self.list = self.file = None
@@ -633,8 +632,10 @@ def read_multi(self, environ, keep_blank_values, strict_parsing):
             if 'content-length' in headers:
                 del headers['content-length']
 
+            limit = None if self.limit is None \
+                else self.limit - self.bytes_read
             part = klass(self.fp, headers, ib, environ, keep_blank_values,
-                         strict_parsing,self.limit-self.bytes_read,
+                         strict_parsing, limit,
                          self.encoding, self.errors)
             self.bytes_read += part.bytes_read
             self.list.append(part)
@@ -651,7 +652,7 @@ def read_single(self):
             self.read_lines()
         self.file.seek(0)
 
-    bufsize = 8*1024            # I/O buffering size for copy to file
+    bufsize = 8 * 1024            # I/O buffering size for copy to file
 
     def read_binary(self):
         """Internal: read binary data."""
@@ -699,7 +700,7 @@ def __write(self, line):
     def read_lines_to_eof(self):
         """Internal: read lines until EOF."""
         while 1:
-            line = self.fp.readline(1<<16) # bytes
+            line = self.fp.readline(1 << 16) # bytes
             self.bytes_read += len(line)
             if not line:
                 self.done = -1
@@ -717,9 +718,9 @@ def read_lines_to_outerboundary(self):
         last_line_lfend = True
         _read = 0
         while 1:
-            if _read >= self.limit:
+            if self.limit is not None and _read >= self.limit:
                 break
-            line = self.fp.readline(1<<16) # bytes
+            line = self.fp.readline(1 << 16) # bytes
             self.bytes_read += len(line)
             _read += len(line)
             if not line:
@@ -763,7 +764,7 @@ def skip_lines(self):
         last_boundary = next_boundary + b"--"
         last_line_lfend = True
         while True:
-            line = self.fp.readline(1<<16)
+            line = self.fp.readline(1 << 16)
             self.bytes_read += len(line)
             if not line:
                 self.done = -1
@@ -805,7 +806,7 @@ def make_file(self):
             return tempfile.TemporaryFile("wb+")
         else:
             return tempfile.TemporaryFile("w+",
-                encoding=self.encoding, newline = '\n')
+                encoding=self.encoding, newline='\n')
 
 
 # Test/debug code