Merge from 3.4

Issue #22421 - Secure pydoc server run. Bind it to localhost instead of all interfaces.

2 files changed, 4 insertions, 2 deletions

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index a577543218..8f3393b011 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -2176,8 +2176,8 @@ def _start_server(urlhandler, port):
     class DocServer(http.server.HTTPServer):
 
         def __init__(self, port, callback):
-            self.host = (sys.platform == 'mac') and '127.0.0.1' or 'localhost'
-            self.address = ('', port)
+            self.host = 'localhost'
+            self.address = (self.host, port)
             self.callback = callback
             self.base.__init__(self, self.address, self.handler)
             self.quit = False
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index bf808d3dfb..67424442e6 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -789,6 +789,8 @@ class PydocServerTest(unittest.TestCase):
             return text
 
         serverthread = pydoc._start_server(my_url_handler, port=0)
+        self.assertIn('localhost', serverthread.docserver.address)
+
         starttime = time.time()
         timeout = 1  #seconds