Author: rjung
Date: Wed Feb 25 18:12:02 2009
New Revision: 747878
URL: http://svn.apache.org/viewvc?rev=747878&view=rev
Log:
Allow AJP13 worker ports lower or equal to 1024.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c?rev=747878&r1=747877&r2=747878&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c Wed Feb 25
18:12:02 2009
@@ -191,7 +191,7 @@
"In jk_worker_t::validate for worker %s contact is %s:%d",
p->name, host, port);
- if (port > 1024 && host) {
+ if (host) {
if (jk_resolve(host, port, &p->worker_inet_addr, we->pool, l)) {
return JK_TRUE;
}
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=747878&r1=747877&r2=747878&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Wed Feb 25
18:12:02 2009
@@ -2488,10 +2488,9 @@
/* Copy the contact to shm */
strncpy(p->s->host, p->host, JK_SHM_STR_SIZ);
p->s->port = p->port;
- /* Resolve if port > 1024.
- *
+ /* Resolve if port > 0.
*/
- if (p->port > 1024) {
+ if (p->port > 0) {
if (jk_resolve(p->host, p->port, &p->worker_inet_addr, we->pool,
l)) {
p->s->addr_sequence = p->addr_sequence = 1;
JK_TRACE_EXIT(l);
@@ -2506,7 +2505,7 @@
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"worker %s contact is disabled",
- p->name, p->host, p->port);
+ p->name);
JK_TRACE_EXIT(l);
return JK_TRUE;
}
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=747878&r1=747877&r2=747878&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Feb 25
18:12:02 2009
@@ -43,6 +43,9 @@
<br />
<subsection name="Native">
<changelog>
+ <update>
+ AJP: Allow worker ports lower or equal to 1024. (rjung)
+ </update>
<fix>
<bug>46763</bug>: Apache 2.0: Survive the log mutex during graceful
restart. Patch provided by Eiji Takahashi. (mturk)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
