[Python-checkins] cpython: Fix Issue6085 - SimpleHTTPServer address_string to return client ip instead of
senthil.kumaran
python-checkins at python.org
Sun Apr 29 06:52:17 CEST 2012
http://hg.python.org/cpython/rev/64a6824d129d
changeset: 76614:64a6824d129d
user: Senthil Kumaran <senthil at uthcode.com>
date: Sun Apr 29 12:51:54 2012 +0800
summary:
Fix Issue6085 - SimpleHTTPServer address_string to return client ip instead of client hostname
files:
Doc/library/http.server.rst | 7 +++++--
Lib/http/server.py | 13 ++-----------
Misc/NEWS | 3 +++
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -269,8 +269,11 @@
.. method:: address_string()
- Returns the client address, formatted for logging. A name lookup is
- performed on the client's IP address.
+ Returns the client address.
+
+ .. versionchanged:: 3.3
+ Previously, a name lookup was performed. To avoid name resolution
+ delays, it now always returns the IP address.
.. class:: SimpleHTTPRequestHandler(request, client_address, server)
diff --git a/Lib/http/server.py b/Lib/http/server.py
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -558,15 +558,9 @@
'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
def address_string(self):
- """Return the client address formatted for logging.
+ """Return the client address."""
- This version looks up the full hostname using gethostbyaddr(),
- and tries to find a name that contains at least one dot.
-
- """
-
- host, port = self.client_address[:2]
- return socket.getfqdn(host)
+ return self.client_address[0]
# Essentially static class variables
@@ -1040,9 +1034,6 @@
env['SCRIPT_NAME'] = scriptname
if query:
env['QUERY_STRING'] = query
- host = self.address_string()
- if host != self.client_address[0]:
- env['REMOTE_HOST'] = host
env['REMOTE_ADDR'] = self.client_address[0]
authorization = self.headers.get("authorization")
if authorization:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,9 @@
Library
-------
+- Issue #6085: In http.server.py SimpleHTTPServer.address_string returns the
+ client ip address instead client hostname. Patch by Charles-François Natali.
+
- Issue #14309: Deprecate time.clock(), use time.perf_counter() or
time.process_time() instead.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list