ben, below is the patch that was recently committed...
here is michal's comments on it:
Yes, I've got. The problem comes from this:
if (ret=ap_scan_script_header_err_buff(r,buffsocket,NULL)) {
ap_kill_timeout(r);
jserv_error(JSERV_LOG_EMERG,cfg,"ajp12: %s (%d)",
"cannot scan servlet headers ", ret);
return SERVER_ERROR;
}
ap_scan_script_header_err_buff() tries to be nice and helpful, so it
returns a correct status. In this case it is 304 Not Modified. However,
we do a bad thing that we return SERVER_ERROR here - we just should
return 'ret' value.
----------
From: Java Apache CVS Development <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: CVS update: jserv/src/c jserv_ajpv12.c
Date: Thu, Aug 5, 1999, 1:11 AM
User: michal
Date: 99/08/05 01:11:42
Modified: src/c jserv_ajpv12.c
Log:
Corrected mod_jserv/4790 bug.
Revision Changes Path
1.9 +5 -4 jserv/src/c/jserv_ajpv12.c
Index: jserv_ajpv12.c
===================================================================
RCS file: /products/cvs/master/jserv/src/c/jserv_ajpv12.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jserv_ajpv12.c 1999/08/04 00:50:16 1.8
+++ jserv_ajpv12.c 1999/08/05 08:11:42 1.9
@@ -57,7 +57,7 @@
* Description: ajpv1.2 protocol, used to call local or remote jserv
hosts *
* Author: Pierpaolo Fumagalli <[EMAIL PROTECTED]>
*
* Author: Michal Mosiewicz <[EMAIL PROTECTED]>
*
- * Version: $Revision: 1.8 $
*
+ * Version: $Revision: 1.9 $
*
****************************************************************************
*/
#include "jserv.h"
@@ -477,9 +477,10 @@
ap_hard_timeout("ajpv12-read", r);
if (ret=ap_scan_script_header_err_buff(r,buffsocket,NULL)) {
ap_kill_timeout(r);
- jserv_error(JSERV_LOG_EMERG,cfg,"ajp12: %s",
- "cannot scan servlet headers");
- return SERVER_ERROR;
+ if( ret>=500 || ret < 0)
+ jserv_error(JSERV_LOG_EMERG,cfg,"ajp12: %s (%d)",
+ "cannot scan servlet headers ", ret);
+ return ret;
}
/* Check for our Error headers */
