mturk 2005/02/16 07:28:28
Modified: jk/native/common jk_ajp12_worker.c jk_ajp_common.c
jk_connect.c jk_connect.h
Log:
Disable Nagle algorithm by default. It was disabled anyhow, so
just clean up the API. No functional change.
Revision Changes Path
1.26 +2 -2
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_ajp12_worker.c 16 Feb 2005 15:22:46 -0000 1.25
+++ jk_ajp12_worker.c 16 Feb 2005 15:28:28 -0000 1.26
@@ -100,7 +100,7 @@
for (attempt = 0; attempt < p->worker->connect_retry_attempts;
attempt++) {
p->sd =
- jk_open_socket(&p->worker->worker_inet_addr, JK_TRUE,
+ jk_open_socket(&p->worker->worker_inet_addr,
JK_FALSE, -1, l);
jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::service, sd = %d",
1.84 +2 -2
jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- jk_ajp_common.c 16 Feb 2005 15:09:20 -0000 1.83
+++ jk_ajp_common.c 16 Feb 2005 15:28:28 -0000 1.84
@@ -835,7 +835,7 @@
JK_TRACE_ENTER(l);
for (attempt = 0; attempt < ae->worker->connect_retry_attempts;
attempt++) {
- ae->sd = jk_open_socket(&ae->worker->worker_inet_addr, JK_TRUE,
+ ae->sd = jk_open_socket(&ae->worker->worker_inet_addr,
ae->worker->keepalive,
ae->worker->socket_timeout, l);
if (ae->sd >= 0) {
1.39 +8 -13 jakarta-tomcat-connectors/jk/native/common/jk_connect.c
Index: jk_connect.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jk_connect.c 6 Feb 2005 13:30:34 -0000 1.38
+++ jk_connect.c 16 Feb 2005 15:28:28 -0000 1.39
@@ -122,11 +122,12 @@
/** connect to Tomcat */
-int jk_open_socket(struct sockaddr_in *addr, int ndelay,
+int jk_open_socket(struct sockaddr_in *addr,
int keepalive, int timeout, jk_logger_t *l)
{
char buf[32];
int sock;
+ int set = 1;
JK_TRACE_ENTER(l);
@@ -186,21 +187,15 @@
JK_TRACE_EXIT(l);
return -1;
}
- if (ndelay) {
- int set = 1;
- if (JK_IS_DEBUG_LEVEL(l))
- jk_log(l, JK_LOG_DEBUG,
- "jk_open_socket, set TCP_NODELAY to on");
- setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&set,
- sizeof(set));
- }
+ setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&set,
+ sizeof(set));
if (keepalive) {
- int keep = 1;
+ set = 1;
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"jk_open_socket, set SO_KEEPALIVE to on");
- setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (const char *)&keep,
- sizeof(keep));
+ setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (const char *)&set,
+ sizeof(set));
}
len = 8*1024; /* Default AJP packet size */
1.12 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_connect.h
Index: jk_connect.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_connect.h 6 Feb 2005 13:30:34 -0000 1.11
+++ jk_connect.h 16 Feb 2005 15:28:28 -0000 1.12
@@ -37,7 +37,7 @@
int jk_resolve(const char *host, int port, struct sockaddr_in *rc);
-int jk_open_socket(struct sockaddr_in *addr, int ndelay,
+int jk_open_socket(struct sockaddr_in *addr,
int keepalive, int timeout, jk_logger_t *l);
int jk_close_socket(int s);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
