Browse Source

Merge from 3.3

Issue #22421 - Secure pydoc server run. Bind it to localhost instead of all interfaces.
pull/224/head
Senthil Kumaran 11 years ago
parent
commit
aa72b1b448
  1. 4
      Lib/pydoc.py
  2. 2
      Lib/test/test_pydoc.py

4
Lib/pydoc.py

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

2
Lib/test/test_pydoc.py

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

Loading…
Cancel
Save