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

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


http://hg.python.org/cpython/rev/d36c0f2ab821
changeset:   92450:d36c0f2ab821
branch:      3.4
parent:      92446:28c21f09719e
parent:      92449:c438f6aaafa9
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Wed Sep 17 13:19:01 2014 +0800
summary:
  Merge from 3.3

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
@@ -2178,8 +2178,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
@@ -803,6 +803,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