benoitc · May 31, 2019 · May 31, 2019 · May 31, 2019 · Jul 16, 2019 · Nov 26, 2019
diff --git a/.pylintrc b/.pylintrc
@@ -34,6 +34,7 @@ disable=
     no-staticmethod-decorator,
     not-callable,
     protected-access,
+    raise-missing-from,
     redefined-outer-name,
     too-few-public-methods,
     too-many-arguments,

diff --git a/.travis.yml b/.travis.yml
@@ -1,33 +1,33 @@
-sudo: false
 language: python
 matrix:
   include:
     - python: 3.8
       env: TOXENV=lint
-      dist: xenial
-      sudo: true
+    - python: 3.8
+      env: TOXENV=docs-lint
     - python: 3.5
       env: TOXENV=py35
     - python: 3.6
       env: TOXENV=py36
     - python: 3.7
       env: TOXENV=py37
-      dist: xenial
-      sudo: true
-    - python: pypy3
-      env: TOXENV=pypy3
-      dist: xenial
     - python: 3.8
       env: TOXENV=py38
+    - python: 3.9
+      env: TOXENV=py39
+    - python: pypy3
+      env:
+        - TOXENV=pypy3
+        # Embedded c-ares takes a long time to build and
+        # as-of 2020-01-04 there are no PyPy3 manylinux
+        # wheels for gevent on PyPI.
+        - GEVENTSETUP_EMBED_CARES=no
       dist: xenial
-      sudo: true
-    - python: 3.8
-      env: TOXENV=docs-lint
-      dist: xenial
-      sudo: true
-install: pip install tox
+install: pip install -U tox coverage
 # TODO: https://github.com/tox-dev/tox/issues/149
 script: tox --recreate
+after_success:
+    - if [ -f .coverage ]; then coverage report ; fi
 cache:
   directories:
     - .tox

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -6,6 +6,7 @@ Konstantin Kapustin <sirkonst@gmail.com>
 Randall Leeds <randall.leeds@gmail.com>
 Berker Peksağ <berker.peksag@gmail.com>
 Jason Madden <jason@nextthought.com>
+Brett Randall <javabrett@gmail.com>
 
 Alumni
 ======

diff --git a/NOTICE b/NOTICE
@@ -82,41 +82,6 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-doc/sitemap_gen.py
-------------------
-Under BSD License :
-
-Copyright (c) 2004, 2005, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Google Inc. nor the names of its contributors
-      may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 
 util/unlink.py
 --------------

diff --git a/README.rst b/README.rst
@@ -23,7 +23,7 @@ Feel free to join us in `#gunicorn`_ on Freenode_.
 Documentation
 -------------
 
-The documentation is hosted at http://docs.gunicorn.org.
+The documentation is hosted at https://docs.gunicorn.org.
 
 Installation
 ------------

diff --git a/appveyor.yml b/appveyor.yml
@@ -9,11 +9,17 @@ environment:
       PYTHON: "C:\\Python36-x64"
     - TOXENV: py37
       PYTHON: "C:\\Python37-x64"
+    - TOXENV: py38
+      PYTHON: "C:\\Python38-x64"
+    - TOXENV: py39
+      PYTHON: "C:\\Python39-x64"
 matrix:
   allow_failures:
     - TOXENV: py35
     - TOXENV: py36
     - TOXENV: py37
+    - TOXENV: py38
+    - TOXENV: py39
 init: SET "PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
 install:
   - pip install tox

diff --git a/docs/gunicorn_ext.py b/docs/gunicorn_ext.py
@@ -50,27 +50,29 @@ def format_settings(app):
 def fmt_setting(s):
     if callable(s.default):
         val = inspect.getsource(s.default)
-        val = "\n".join("    %s" % l for l in val.splitlines())
-        val = " ::\n\n" + val
+        val = "\n".join("    %s" % line for line in val.splitlines())
+        val = "\n\n.. code-block:: python\n\n" + val
     elif s.default == '':
-        val = "``(empty string)``"
+        val = "``''``"
     else:
-        val = "``%s``" % s.default
+        val = "``%r``" % s.default
 
     if s.cli and s.meta:
-        args = ["%s %s" % (arg, s.meta) for arg in s.cli]
-        cli = ', '.join(args)
+        cli = " or ".join("``%s %s``" % (arg, s.meta) for arg in s.cli)
     elif s.cli:
-        cli = ", ".join(s.cli)
+        cli = " or ".join("``%s``" % arg for arg in s.cli)
+    else:
+        cli = ""
 
     out = []
     out.append(".. _%s:\n" % s.name.replace("_", "-"))
-    out.append("%s" % s.name)
-    out.append("~" * len(s.name))
+    out.append("``%s``" % s.name)
+    out.append("~" * (len(s.name) + 4))
     out.append("")
     if s.cli:
-        out.append("* ``%s``" % cli)
-    out.append("* %s" % val)
+        out.append("**Command line:** %s" % cli)
+        out.append("")
+    out.append("**Default:** %s" % val)
     out.append("")
     out.append(s.desc)
     out.append("")

diff --git a/docs/site/index.html b/docs/site/index.html
@@ -16,7 +16,7 @@
     <div class="logo-div">
       <div class="latest">
         Latest version: <strong><a
-            href="https://docs.gunicorn.org/en/stable/">20.0.3</a></strong>
+            href="https://docs.gunicorn.org/en/stable/">20.0.4</a></strong>
       </div>
 
       <div class="logo"><img src="images/logo.jpg" ></div>

diff --git a/docs/site/sitemap.xml b/docs/site/sitemap.xml
@@ -1,112 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset
-  xmlns="http://www.google.com/schemas/sitemap/0.84"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.google.com/schemas/sitemap/0.84
-                      http://www.google.com/schemas/sitemap/0.84/sitemap.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
  <url>
   <loc>http://gunicorn.org/</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <lastmod>2019-11-27T00:02:48+01:00</lastmod>
+  <priority>1.0</priority>
  </url>
  <url>
-  <loc>http://gunicorn.org/configuration.html</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <loc>http://gunicorn.org/community.html</loc>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
  <url>
-  <loc>http://gunicorn.org/configure.html</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
- </url>
- <url>
-  <loc>http://gunicorn.org/css/</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
- </url>
- <url>
-  <loc>http://gunicorn.org/css/index.css</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <loc>http://gunicorn.org/configuration.html</loc>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
  <url>
-  <loc>http://gunicorn.org/css/style.css</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <loc>http://gunicorn.org/configure.html</loc>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
  <url>
   <loc>http://gunicorn.org/deploy.html</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
  <url>
   <loc>http://gunicorn.org/deployment.html</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
  <url>
   <loc>http://gunicorn.org/design.html</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
  <url>
   <loc>http://gunicorn.org/faq.html</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
- </url>
- <url>
-  <loc>http://gunicorn.org/images/</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
- </url>
- <url>
-  <loc>http://gunicorn.org/images/gunicorn.png</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
- </url>
- <url>
-  <loc>http://gunicorn.org/images/large_gunicorn.png</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
- </url>
- <url>
-  <loc>http://gunicorn.org/images/logo.png</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
- </url>
- <url>
-  <loc>http://gunicorn.org/index.html</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
  <url>
   <loc>http://gunicorn.org/install.html</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
  <url>
   <loc>http://gunicorn.org/installation.html</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
  <url>
   <loc>http://gunicorn.org/news.html</loc>
-  <lastmod>2010-07-08T19:57:19Z</lastmod>
-  <priority>0.5000</priority>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
  <url>
   <loc>http://gunicorn.org/run.html</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
  <url>
   <loc>http://gunicorn.org/tuning.html</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
  <url>
   <loc>http://gunicorn.org/usage.html</loc>
-  <lastmod>2010-07-01T05:14:22Z</lastmod>
-  <priority>0.5000</priority>
+  <lastmod>2012-10-04T00:43:15+05:45</lastmod>
+  <priority>0.5</priority>
  </url>
 </urlset>
diff --git a/docs/sitemap_config.xml b/docs/sitemap_config.xml