Author: markt
Date: Thu Jan 6 17:02:27 2011
New Revision: 1055938
URL: http://svn.apache.org/viewvc?rev=1055938&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319
Don't return null for getRemoteHost() if the IP address cannot be resolved.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1055938&r1=1055937&r2=1055938&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Jan
6 17:02:27 2011
@@ -464,6 +464,9 @@ public class Http11AprProcessor extends
try {
long sa = Address.get(Socket.APR_REMOTE, socketRef);
remoteHost = Address.getnameinfo(sa, 0);
+ if (remoteHost == null) {
+ remoteHost = Address.getip(sa);
+ }
} catch (Exception e) {
log.warn(sm.getString("http11processor.socket.info"), e);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1055938&r1=1055937&r2=1055938&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 6 17:02:27 2011
@@ -188,6 +188,12 @@
</subsection>
<subsection name="Coyote">
<changelog>
+ <fix>
+ <bug>47319</bug>: Return the client's IP address rather than null
+ for calls to <code>getRemoteHost()</code> when the APR connector is
+ used with <code>enableLookups="true"</code> but the IP
address
+ is not resolveable. (markt)
+ </fix>
<add>
<bug>50108</bug>: Add get/set methods for Connector property
minSpareThreads. Patch provided by Eiji Takahashi. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
