You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2014/02/26 12:50:57 UTC

svn commit: r1572024 - in /tomcat/jk/trunk/native/common: jk_ajp12_worker.c jk_ajp_common.c

Author: rjung
Date: Wed Feb 26 11:50:56 2014
New Revision: 1572024

URL: http://svn.apache.org/r1572024
Log:
Be more explicit with default for prefer_ipv6.

Modified:
    tomcat/jk/trunk/native/common/jk_ajp12_worker.c
    tomcat/jk/trunk/native/common/jk_ajp_common.c

Modified: tomcat/jk/trunk/native/common/jk_ajp12_worker.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp12_worker.c?rev=1572024&r1=1572023&r2=1572024&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp12_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp12_worker.c Wed Feb 26 11:50:56 2014
@@ -192,7 +192,7 @@ static int JK_METHOD validate(jk_worker_
                p->name, host, port);
 
         if (host) {
-            if (jk_resolve(host, port, &p->worker_inet_addr, we->pool, 0, l)) {
+            if (jk_resolve(host, port, &p->worker_inet_addr, we->pool, JK_FALSE, l)) {
                 return JK_TRUE;
             }
             jk_log(l, JK_LOG_ERROR,

Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1572024&r1=1572023&r2=1572024&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Wed Feb 26 11:50:56 2014
@@ -2730,7 +2730,7 @@ int ajp_validate(jk_worker_t *pThis,
             host = "undefined";
         }
         strncpy(p->host, jk_get_worker_host(props, p->name, host), JK_SHM_STR_SIZ);
-        p->prefer_ipv6 = jk_get_worker_prefer_ipv6(props, p->name, 0);
+        p->prefer_ipv6 = jk_get_worker_prefer_ipv6(props, p->name, JK_FALSE);
         if (p->s->h.sequence == 0) {
             /* Initial setup.
              */



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org