run linkcheck and fix redirects, broken links

7 files changed, 20 insertions, 25 deletions

diff --git a/HISTORY.txt b/HISTORY.txt
index 9932582..1ffefe3 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -254,7 +254,7 @@ Features
 ~~~~~~~~
 
 - Support the WSGI ``wsgi.file_wrapper`` protocol as per
-  http://www.python.org/dev/peps/pep-0333/#optional-platform-specific-file-handling.
+  https://www.python.org/dev/peps/pep-0333/#optional-platform-specific-file-handling.
   Here's a usage example::
 
     import os
diff --git a/docs/filewrapper.rst b/docs/filewrapper.rst
index a119594..c0d534a 100644
--- a/docs/filewrapper.rst
+++ b/docs/filewrapper.rst
@@ -1,9 +1,7 @@
 Support for ``wsgi.file_wrapper``
 ---------------------------------
 
-Waitress supports the `WSGI file_wrapper protocol
-<http://www.python.org/dev/peps/pep-0333/#optional-platform-specific-file-handling>`_
-.  Here's a usage example:
+Waitress supports the Python Web Server Gateway Interface v1.0 as specified in :pep:`333`.  Here's a usage example:
 
 .. code-block:: python
 
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 9729a74..71ea3f1 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -8,22 +8,21 @@ Glossary
 
    PasteDeploy
       A system for configuration of WSGI web components in declarative
-      ``.ini`` format.  See http://pythonpaste.org/deploy/.
+      ``.ini`` format.  See https://web.archive.org/web/20161029233359/http://pythonpaste.org/deploy/.
 
    asyncore
-      A standard library module for asynchronous communications.  See
-      http://docs.python.org/library/asyncore.html .
+      A Python standard library module for asynchronous communications.  See :mod:`asyncore`.
 
    middleware
      *Middleware* is a :term:`WSGI` concept.  It is a WSGI component
      that acts both as a server and an application.  Interesting uses
      for middleware exist, such as caching, content-transport
-     encoding, and other functions.  See `WSGI.org <http://www.wsgi.org>`_
-     or `PyPI <http://python.org/pypi>`_ to find middleware for your
+     encoding, and other functions.  See `WSGI.org <https://wsgi.readthedocs.io/en/latest/>`_
+     or `PyPI <https://pypi.org/search/?c=Topic+%3A%3A+Internet+%3A%3A+WWW%2FHTTP+%3A%3A+WSGI+%3A%3A+Middleware>`_ to find middleware for your
      application.
 
    WSGI
-     `Web Server Gateway Interface <http://www.wsgi.org/>`_.  This is a
+     `Web Server Gateway Interface <https://wsgi.readthedocs.io/en/latest/>`_.  This is a
      Python standard for connecting web applications to web servers,
      similar to the concept of Java Servlets.  Waitress requires
      that your application be served as a WSGI application.
diff --git a/docs/index.rst b/docs/index.rst
index 2a2260b..2b264e7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -141,9 +141,9 @@ Web Traffic Logging With Paste's TransLogging Middleware
 The WSGI design is modular.  Waitress logs error conditions, debugging
 output, etc., but not web traffic.  For web traffic logging Paste
 provides the `TransLogger
-<http://pythonpaste.org/modules/translogger.html>`_
+<https://web.archive.org/web/20160707041338/http://pythonpaste.org/modules/translogger.html>`_
 :term:`middleware`.  TransLogger produces logs in the `Apache Combined
-Log Format <http://httpd.apache.org/docs/2.2/logs.html#combined>`_.
+Log Format <https://httpd.apache.org/docs/current/logs.html#combined>`_.
 But TransLogger does not write to files, the Python logging system
 must be configured to do this.  The Python `FileHandler
 <https://docs.python.org/3/library/logging.handlers.html#filehandler>`_
@@ -461,28 +461,26 @@ Known Issues
 Support and Development
 -----------------------
 
-The `Pylons Project web site <http://pylonsproject.org/>`_ is the main online
+The `Pylons Project web site <https://pylonsproject.org/>`_ is the main online
 source of Waitress support and development information.
 
 To report bugs, use the `issue tracker
-<http://github.com/Pylons/waitress/issues>`_.
+<https://github.com/Pylons/waitress/issues>`_.
 
 If you've got questions that aren't answered by this documentation,
-contact the `Pylons-devel maillist
-<http://groups.google.com/group/pylons-devel>`_ or join the `#pyramid
-IRC channel <irc://irc.freenode.net/#pyramid>`_.
+contact the `Pylons-discuss maillist
+<https://groups.google.com/forum/#!forum/pylons-discuss>`_ or join the `#pyramid
+IRC channel <https://webchat.freenode.net/?channels=pyramid>`_.
 
 Browse and check out tagged and trunk versions of Waitress via
-the `Waitress GitHub repository <http://github.com/Pylons/waitress/>`_.
+the `Waitress GitHub repository <https://github.com/Pylons/waitress/>`_.
 To check out the trunk via ``git``, use this command:
 
 .. code-block:: text
 
   git clone git@github.com:Pylons/waitress.git
 
-To find out how to become a contributor to Waitress, please see the
-`contributor's section of the documentation
-<http://docs.pylonsproject.org/index.html#contributing>`_.
+To find out how to become a contributor to Waitress, please see the guidelines in `contributing.md <https://github.com/Pylons/waitress/blob/master/contributing.md>`_ and `How to Contribute Source Code and Documentation <https://pylonsproject.org/community-how-to-contribute.html>`_.
 
 Why?
 ----
@@ -512,7 +510,7 @@ framework distribution simply for its server component is awkward.  The test
 suite of the CherryPy server also depends on the CherryPy web framework, so
 even if we forked its server component into a separate distribution, we would
 have still needed to backfill for all of its tests.  The CherryPy team has
-started work on `Cheroot <https://bitbucket.org/cherrypy/cheroot>`_, which
+started work on `Cheroot <https://bitbucket.org/cherrypy/cheroot/src/default/>`_, which
 should solve this problem, however.
 
 Waitress is a fork of the WSGI-related components which existed in
diff --git a/waitress/parser.py b/waitress/parser.py
index 6d2f340..4106b56 100644
--- a/waitress/parser.py
+++ b/waitress/parser.py
@@ -274,7 +274,7 @@ def get_header_lines(header):
     for line in lines:
         if line.startswith((b' ', b'\t')):
             if not r:
-                # http://corte.si/posts/code/pathod/pythonservers/index.html
+                # https://corte.si/posts/code/pathod/pythonservers/index.html
                 raise ParsingError('Malformed header line "%s"' % tostr(line))
             r[-1] += line
         else:
diff --git a/waitress/tests/test_functional.py b/waitress/tests/test_functional.py
index 59ef4e4..0571ce6 100644
--- a/waitress/tests/test_functional.py
+++ b/waitress/tests/test_functional.py
@@ -155,7 +155,7 @@ class EchoTests(object):
         self.assertTrue(headers.get('date'))
 
     def test_bad_host_header(self):
-        # http://corte.si/posts/code/pathod/pythonservers/index.html
+        # https://corte.si/posts/code/pathod/pythonservers/index.html
         to_send = ("GET / HTTP/1.0\n"
                    " Host: 0\n\n")
         to_send = tobytes(to_send)
diff --git a/waitress/tests/test_parser.py b/waitress/tests/test_parser.py
index ecb6606..801f784 100644
--- a/waitress/tests/test_parser.py
+++ b/waitress/tests/test_parser.py
@@ -286,7 +286,7 @@ class Test_get_header_lines(unittest.TestCase):
         self.assertEqual(result, [b'slam\tslim'])
 
     def test_get_header_lines_malformed(self):
-        # http://corte.si/posts/code/pathod/pythonservers/index.html
+        # https://corte.si/posts/code/pathod/pythonservers/index.html
         from waitress.parser import ParsingError
         self.assertRaises(ParsingError,
                           self._callFUT, b' Host: localhost\r\n\r\n')