httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject cvs commit: httpd-2.0/modules/http http_core.c
Date Tue, 27 Feb 2001 21:02:15 GMT
jwoolley    01/02/27 13:02:15

  Modified:    include  http_protocol.h
               server   error_bucket.c
               modules/http http_core.c
  Log:
  Update to reflect the absence of the apr_bucket_shared
  struct and the newly-added start field of the apr_bucket struct
  
  Revision  Changes    Path
  1.58      +1 -1      httpd-2.0/include/http_protocol.h
  
  Index: http_protocol.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_protocol.h,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -d -u -r1.57 -r1.58
  --- http_protocol.h	2001/02/26 04:38:19	1.57
  +++ http_protocol.h	2001/02/27 21:02:15	1.58
  @@ -561,7 +561,7 @@
       /** The error code */
       int status;
       /** The error string */
  -    const char    *start;
  +    const char    *data;
   };
   
   AP_DECLARE_DATA extern const apr_bucket_type_t ap_bucket_type_error;
  
  
  
  1.2       +2 -3      httpd-2.0/server/error_bucket.c
  
  Index: error_bucket.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/error_bucket.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -d -u -r1.1 -r1.2
  --- error_bucket.c	2001/02/25 04:24:17	1.1
  +++ error_bucket.c	2001/02/27 21:02:15	1.2
  @@ -78,11 +78,10 @@
           return NULL;
       }
       h->status = error;
  -    if (buf) {
  -        h->start = apr_pstrdup(p, buf);
  -    }
  +    h->data = (buf) ? apr_pstrdup(p, buf) : NULL;
   
       b->length = 0;
  +    b->start  = 0;
       b->type = &ap_bucket_type_error;
       b->data = h;
       return b;
  
  
  
  1.265     +2 -3      httpd-2.0/modules/http/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_core.c,v
  retrieving revision 1.264
  retrieving revision 1.265
  diff -u -d -u -r1.264 -r1.265
  --- http_core.c	2001/02/25 23:08:52	1.264
  +++ http_core.c	2001/02/27 21:02:15	1.265
  @@ -3219,8 +3219,7 @@
                */
               else if (APR_BUCKET_IS_FILE(e)
                        && (e->length >= AP_MIN_SENDFILE_BYTES)) {
  -                apr_bucket_shared *s = e->data;
  -                apr_bucket_file *a = s->data;
  +                apr_bucket_file *a = e->data;
       
                   /* We can't handle more than one file bucket at a time
                    * so we split here and send the file we have already
  @@ -3233,7 +3232,7 @@
       
                   fd = a->fd;
                   flen = e->length;
  -                foffset = s->start;
  +                foffset = e->start;
               }
               else {
                   const char *str;
  
  
  

Mime
View raw message