Hi.
Sorry I didn't get back to you before, but I guess I must have overlooked your
e-mail.
This patch does not fix the problem. If you don't set r->status line to NULL,
Apache still thinks there was an error.
Note the difference between this patch and my patch.
I suggest trying out a version of Apache with this patch against my test servlet
- you will see that you still get the error.
- Ben Kelley.
jon * wrote:
> 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 */
--
Ben Kelley - [EMAIL PROTECTED]
Phone +61 (0)2 9324 2382 Fax +61 (0)2 9324 2400
Internet - http://www.ozemail.com.au/~bkelley
WDR Intranet - http://syddevwww.swissbank.com/People/Ben_Kelley.html
Warburg Dillon Read, Governor Phillip Tower, 1 Farrer Pl, Sydney, 2000 Australia
This message contains confidential information and is intended only
for the individual named. If you are not the named addressee you
should not disseminate, distribute or copy this e-mail. Please
notify the sender immediately by e-mail if you have received this
e-mail by mistake and delete this e-mail from your system.
E-mail transmission cannot be guaranteed to be secure or error-free
as information could be intercepted, corrupted, lost, destroyed,
arrive late or incomplete, or contain viruses. The sender therefore
does not accept liability for any errors or omissions in the contents
of this message which arise as a result of e-mail transmission. If
verification is required please request a hard-copy version. This
message is provided for informational purposes and should not be
construed as a solicitation or offer to buy or sell any securities or
related financial instruments.
