summaryrefslogtreecommitdiff
path: root/Lib/pydoc.py
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2014-09-17 13:19:01 +0800
committerSenthil Kumaran <senthil@uthcode.com>2014-09-17 13:19:01 +0800
commitaa72b1b448d09ddbff737ee1a3e0cb40cb6ca047 (patch)
treec2df85b0d20e7caab4f8a9dc29f1c23dd5f059ad /Lib/pydoc.py
parentf75805edb8d1399586bae6c12611705a4345b572 (diff)
parent2a42a0bff36129fc9aec06b20e67747cfcc85230 (diff)
downloadcpython-git-aa72b1b448d09ddbff737ee1a3e0cb40cb6ca047.tar.gz
Merge from 3.3
Issue #22421 - Secure pydoc server run. Bind it to localhost instead of all interfaces.
Diffstat (limited to 'Lib/pydoc.py')
-rwxr-xr-xLib/pydoc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 37abf67063..539342673d 100755
--- a/Lib/pydoc.py
+++ b/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