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 error_bucket.c
Date Sun, 28 Jan 2001 03:36:02 GMT
rbb         01/01/27 19:36:02

  Modified:    .        CHANGES
               modules/http error_bucket.c
  Log:
  Make the error bucket a real meta-data bucket.  This means that the
  bucket length is 0, and a read returns NULL data.  If one of these
  buckets is passed down after the headers are sent, this data will
  just be ignored.
  Submitted by:	Greg Stein
  
  Revision  Changes    Path
  1.60      +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -d -b -w -u -r1.59 -r1.60
  --- CHANGES	2001/01/28 03:00:01	1.59
  +++ CHANGES	2001/01/28 03:36:01	1.60
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0b1
   
  +  *) Make the error bucket a real meta-data bucket.  This means that the
  +     bucket length is 0, and a read returns NULL data.  If one of these
  +     buckets is passed down after the headers are sent, this data will
  +     just be ignored.  [Greg Stein]
  +
     *) The prefork MPM wasn't killing child processes correctly if a restart
        signal was received while the process was serving a request.  The child
        process would become the equivalent of a second parent process.  If
  
  
  
  1.3       +6 -6      httpd-2.0/modules/http/error_bucket.c
  
  Index: error_bucket.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/error_bucket.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -d -b -w -u -r1.2 -r1.3
  --- error_bucket.c	2001/01/27 17:17:50	1.2
  +++ error_bucket.c	2001/01/28 03:36:02	1.3
  @@ -63,10 +63,8 @@
   static apr_status_t error_read(apr_bucket *b, const char **str, 
   			       apr_size_t *len, apr_read_type_e block)
   {
  -    ap_bucket_error *e = b->data;
  -
  -    *str = e->start;
  -    *len = b->length;
  +    *str = NULL;
  +    *len = 0;
       return APR_SUCCESS;
   }
   
  @@ -80,9 +78,11 @@
           return NULL;
       }
       h->status = error;
  +    if (buf) {
       h->start = apr_pstrdup(p, buf);
  +    }
   
  -    b->length = strlen(h->start);
  +    b->length = 0;
       b->type = &ap_bucket_type_error;
       b->data = h;
       return b;
  
  
  

Mime
View raw message