Author: markt
Date: Fri Jan 7 17:49:20 2011
New Revision: 1056414
URL: http://svn.apache.org/viewvc?rev=1056414&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319
Return IP address rather than null for getRemoteHost() and the APR connector
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1056414&r1=1056413&r2=1056414&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 17:49:20 2011
@@ -275,12 +275,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, fhanik, funkman
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319
- Return IP address rather than null for getRemoteHost() and the APR connector
- http://people.apache.org/~markt/patches/2011-01-06-bug47319-tc6.patch
- +1: markt, fhanik, funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
Requests for a newly created directory using MKCOL should not result in a 404
http://svn.apache.org/viewvc?rev=1055975&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1056414&r1=1056413&r2=1056414&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Fri Jan 7 17:49:20 2011
@@ -1084,6 +1084,9 @@ public class Http11AprProcessor implemen
try {
long sa = Address.get(Socket.APR_REMOTE, socket);
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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1056414&r1=1056413&r2=1056414&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 7 17:49:20 2011
@@ -192,6 +192,11 @@
<subsection name="Coyote">
<changelog>
<fix>
+ <bug>47913</bug>: Return the IP address rather than null for
+ <code>getRemoteHost()</code> with the APR connector if the IP address
+ does not resolve. (markt)
+ </fix>
+ <fix>
Avoid a NPE for APR connector unlockAccept with default soTimeout.
(mturk)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
