mturk 2005/05/06 06:49:32
Modified: jk/native/common jk_ajp_common.c
Log:
If tomcat closes the connection after sending initial request, do not log that
as error, because probably the 'secret' has been rejected.
Revision Changes Path
1.108 +14 -6
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.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- jk_ajp_common.c 27 Apr 2005 14:12:48 -0000 1.107
+++ jk_ajp_common.c 6 May 2005 13:49:32 -0000 1.108
@@ -960,11 +960,19 @@
rc = jk_tcp_socket_recvfull(ae->sd, head, AJP_HEADER_LEN);
if (rc < 0) {
- jk_log(l, JK_LOG_ERROR,
- "ERROR: can't receive the response message from tomcat, "
- "network problems or tomcat is down (%s), err=%d",
- jk_dump_hinfo(&ae->worker->worker_inet_addr, buf), rc);
- JK_TRACE_EXIT(l);
+ if (rc == JK_SOCKET_EOF) {
+ jk_log(l, JK_LOG_INFO,
+ "Tomcat has forced a connection close for socket %d",
+ ae->sd);
+ JK_TRACE_EXIT(l);
+ }
+ else {
+ jk_log(l, JK_LOG_ERROR,
+ "Can't receive the response message from tomcat, "
+ "network problems or tomcat is down (%s), err=%d",
+ jk_dump_hinfo(&ae->worker->worker_inet_addr, buf), rc);
+ JK_TRACE_EXIT(l);
+ }
return JK_FALSE;
}
ae->endpoint.rd += rc;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
