traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from 3.4 

Issue #22421 - Secure pydoc server run. Bind it to localhost instead of all interfaces.
This commit is contained in:
Senthil Kumaran 2014-09-17 13:19:34 +08:00
parent d9925a18ec aa72b1b448
commit 810dc9bc81
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/pydoc.py
View File

@ -2176,8 +2176,8 @@ def _start_server(urlhandler, port):
class DocServer(http.server.HTTPServer): class DocServer(http.server.HTTPServer):
def __init__(self, port, callback): def __init__(self, port, callback):
self.host = (sys.platform == 'mac') and '127.0.0.1' or 'localhost' self.host = 'localhost'
self.address = ('', port) self.address = (self.host, port)
self.callback = callback self.callback = callback
self.base.__init__(self, self.address, self.handler) self.base.__init__(self, self.address, self.handler)
self.quit = False self.quit = False

2
Lib/test/test_pydoc.py
View File

@ -789,6 +789,8 @@ class PydocServerTest(unittest.TestCase):
return text return text
serverthread = pydoc._start_server(my_url_handler, port=0) serverthread = pydoc._start_server(my_url_handler, port=0)
self.assertIn('localhost', serverthread.docserver.address)
starttime = time.time() starttime = time.time()
timeout = 1 #seconds timeout = 1 #seconds