Author: mturk
Date: Mon Jun 2 06:44:28 2014
New Revision: 1599095
URL: http://svn.apache.org/r1599095
Log:
Fix BZ56565
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1599095&r1=1599094&r2=1599095&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Mon Jun 2 06:44:28 2014
@@ -400,6 +400,13 @@ int jk_resolve(const char *host, int por
else {
while ((NULL != temp_sa) && (APR_INET != temp_sa->family))
temp_sa = temp_sa->next;
+#if APR_HAVE_IPV6
+ if (NULL == temp_sa) {
+ temp_sa = remote_sa;
+ while ((NULL != temp_sa) && (APR_INET6 != temp_sa->family))
+ temp_sa = temp_sa->next;
+ }
+#endif
}
/* if temp_sa is set, we have a valid address otherwise, just
return */
if (NULL != temp_sa) {
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1599095&r1=1599094&r2=1599095&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Jun 2 06:44:28 2014
@@ -45,6 +45,10 @@
<subsection name="Native">
<changelog>
<fix>
+ <bug>56565</bug>: Fix IPV6 address resolve on non-dual
+ network stacks. (mturk)
+ </fix>
+ <fix>
Reduce log level for "OPTIONS *" requests from warning to debug.
(rjung)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
