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 Sun, 25 Feb 2001 16:57:08 GMT
rbb         01/02/25 08:57:08

  Modified:    .        CHANGES
               modules/http http_protocol.c
  Log:
  Don't assume that the byterange filter will always be called more than
  once.  It is perfectly legal to call the byterange filter one time,
  with all the data.  Without this patch, that case will seg fault.
  Submitted by:	Ryan Morgan <rmogran@covalent.net>
  
  Revision  Changes    Path
  1.111     +7 -1      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -d -b -w -u -r1.110 -r1.111
  --- CHANGES	2001/02/25 04:24:16	1.110
  +++ CHANGES	2001/02/25 16:57:07	1.111
  @@ -1,8 +1,14 @@
  -Changes with Apache 2.0.12-dev
  +Changes with Apache 2.0.13-dev
  +
  +  *) Don't assume that there will always be multiple calls to the byterange 
  +     filter.  It is possible that we will need to do byteranges with only
  +     one call to the filter.  [Ryan Morgan <rmorgan@covalent.net>]
   
     *) Move the error_bucket definition from the http module to the
        core server.  Every protocol will need this ability, not just
        HTTP.  [Ryan Bloom]
  +
  +Changes with Apache 2.0.12
   
     *) Modify mod_file_cache to save pre-formatted strings for 
        content-length and last-modified headers for performance. 
  
  
  
  1.300     +8 -4      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.299
  retrieving revision 1.300
  diff -u -d -b -w -u -r1.299 -r1.300
  --- http_protocol.c	2001/02/21 21:14:33	1.299
  +++ http_protocol.c	2001/02/25 16:57:08	1.300
  @@ -280,10 +280,14 @@
                                NULL);
       ap_xlate_proto_to_ascii(bound_head, strlen(bound_head));
   
  -    /* concat the passed brigade with our saved brigade */
  +    /* If we have a saved brigade from a previous run, concat the passed
  +     * brigade with our saved brigade.  Otherwise just continue.  
  +     */
  +    if (ctx->bb) {
       APR_BRIGADE_CONCAT(ctx->bb, bb);
       bb = ctx->bb;
       ctx->bb = NULL;     /* ### strictly necessary? call brigade_destroy? */
  +    }
   
       /* It is possible that we won't have a content length yet, so we have to
        * compute the length before we can actually do the byterange work.
  
  
  

Mime
View raw message