[Python-checkins] cpython (merge 3.4 -> default): Merge from 3.4

senthil.kumaran python-checkins at python.org
Wed Sep 17 07:19:49 CEST 2014


http://hg.python.org/cpython/rev/9f7b97fac919
changeset:   92451:9f7b97fac919
parent:      92448:ec016ba862ba
parent:      92450:d36c0f2ab821
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Wed Sep 17 13:19:34 2014 +0800
summary:
  Merge from 3.4

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

files:
  Lib/pydoc.py           |  4 ++--
  Lib/test/test_pydoc.py |  2 ++
  2 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Lib/pydoc.py b/Lib/pydoc.py
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -2176,8 +2176,8 @@
     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
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -789,6 +789,8 @@
             return text
 
         serverthread = pydoc._start_server(my_url_handler, port=0)
+        self.assertIn('localhost', serverthread.docserver.address)
+
         starttime = time.time()
         timeout = 1  #seconds
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list