httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/modules/http http_protocol.c
Date Mon, 22 Jan 2001 21:57:57 GMT
rbb         01/01/22 13:57:57

  Modified:    include  util_filter.h
               modules/http http_protocol.c
  Log:
  AP_REQUEST_DONE is bogus and a bad idea.  This had the http_header filter
  return -3 for every HEAD request, which in turn made us call ap_die.  Of
  course, if we didn't have a 200 status (say we had a 206), then we would
  seg fault, because we would end up sending down a second EOS bucket, which
  would in turn make us call the byterange filter again, but at this point,
  we hadn't cleaned up the byterange ctx structure, because it was never
  supposed to be called again.
  
  This was biting us on apache.org, where we had a HEAD request for
  bytes=100- for a file.  This was a major seg fault.  We are better off
  just returning OK is much safer.
  
  Revision  Changes    Path
  1.36      +0 -1      httpd-2.0/include/util_filter.h
  
  Index: util_filter.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/util_filter.h,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -d -b -w -u -r1.35 -r1.36
  --- util_filter.h	2001/01/19 07:04:13	1.35
  +++ util_filter.h	2001/01/22 21:57:56	1.36
  @@ -73,7 +73,6 @@
   
   #define AP_NOBODY_WROTE         -1
   #define AP_NOBODY_READ          -2
  -#define AP_REQUEST_DONE         -3
   
   /* ap_input_mode_t - input filtering modes 
    * 
  
  
  
  1.269     +2 -2      httpd-2.0/modules/http/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
  retrieving revision 1.268
  retrieving revision 1.269
  diff -u -d -b -w -u -r1.268 -r1.269
  --- http_protocol.c	2001/01/19 07:04:21	1.268
  +++ http_protocol.c	2001/01/22 21:57:57	1.269
  @@ -2495,7 +2495,7 @@
   
       if (ctx->headers_sent) {
           apr_brigade_destroy(b);
  -        return AP_REQUEST_DONE;
  +        return OK;
       }
   
       if (r->assbackwards) {
  @@ -2644,7 +2644,7 @@
   
       if (r->header_only) {
           apr_brigade_destroy(b);
  -        return AP_REQUEST_DONE;
  +        return OK;
       }
   
       if (r->chunked) {
  
  
  

Mime
View raw message