Author: mturk
Date: Sat Oct 18 23:24:37 2008
New Revision: 705963
URL: http://svn.apache.org/viewvc?rev=705963&view=rev
Log:
Don't put the worker in error state in case of client errors. Although the
backend connection can be closed and no more connections exist, the worker is
not in error state. It should be able to reconnect on next request
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
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=705963&r1=705962&r2=705963&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sat Oct 18
23:24:37 2008
@@ -2060,13 +2060,14 @@
aw->s->transferred += e->wr;
if (aw->s->busy)
aw->s->busy--;
- if (rc != JK_TRUE) {
+ if (rc == JK_TRUE || rc == JK_CLIENT_ERROR) {
+ aw->s->state = JK_AJP_STATE_OK;
+ }
+ else {
aw->s->state = JK_AJP_STATE_ERROR;
aw->s->errors++;
aw->s->error_time = time(NULL);
}
- else
- aw->s->state = JK_AJP_STATE_OK;
}
/*
@@ -2396,8 +2397,6 @@
"(%s) connecting to tomcat failed.",
aw->name);
-/* XXX: Do we need to fix rc or is_error before returning? */
-
ajp_update_stats(e, aw, rc, l);
JK_TRACE_EXIT(l);
return rc;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
