Author: rjung
Date: Tue Dec 11 10:32:16 2007
New Revision: 603324
URL: http://svn.apache.org/viewvc?rev=603324&view=rev
Log:
jk_open_socket() arguments timeout and buf do not
differentiate between ==0 and <0.
So let's make the usage consistent.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c
tomcat/connectors/trunk/jk/native/nt_service/jk_nt_service.c
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=603324&r1=603323&r2=603324&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c Tue Dec 11
10:32:16 2007
@@ -127,7 +127,7 @@
attempt++) {
p->sd =
jk_open_socket(&p->worker->worker_inet_addr,
- JK_FALSE, -1, 0, l);
+ JK_FALSE, 0, 0, l);
jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::service, sd = %d",
p->sd);
Modified: tomcat/connectors/trunk/jk/native/nt_service/jk_nt_service.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/nt_service/jk_nt_service.c?rev=603324&r1=603323&r2=603324&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/nt_service/jk_nt_service.c (original)
+++ tomcat/connectors/trunk/jk/native/nt_service/jk_nt_service.c Tue Dec 11
10:32:16 2007
@@ -872,7 +872,7 @@
}
if(jk_resolve("localhost", port, &in, NULL)) {
- int sd = jk_open_socket(&in, JK_TRUE, 0, -1, NULL);
+ int sd = jk_open_socket(&in, JK_TRUE, 0, 0, NULL);
if(sd >0) {
int rc = JK_FALSE;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
