mturk 2005/02/16 07:22:46
Modified: jk/native/common jk_ajp12_worker.c
Log:
Ajp12 protocol is not recoverable, so set the return error to 500
in case of failrue.
Revision Changes Path
1.25 +6 -9
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_ajp12_worker.c 16 Feb 2005 15:09:20 -0000 1.24
+++ jk_ajp12_worker.c 16 Feb 2005 15:22:46 -0000 1.25
@@ -91,9 +91,11 @@
if (e && e->endpoint_private && s && is_error) {
ajp12_endpoint_t *p = e->endpoint_private;
- unsigned attempt;
-
- *is_error = 0;
+ unsigned int attempt;
+ /*
+ * AJP12 protocol is not recoverable.
+ */
+ *is_error = JK_HTTP_SERVER_ERROR;
for (attempt = 0; attempt < p->worker->connect_retry_attempts;
attempt++) {
@@ -109,11 +111,6 @@
}
if (p->sd >= 0) {
- /*
- * After we are connected, each error that we are going to
- * have is probably unrecoverable
- */
- *is_error = JK_HTTP_SERVER_ERROR;
jk_sb_open(&p->sb, p->sd);
if (ajpv12_handle_request(p, s, l)) {
jk_log(l, JK_LOG_DEBUG,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
