httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Tue, 24 Jul 2001 20:38:02 GMT
wrowe       01/07/24 13:38:02

  Modified:    modules/cache mod_file_cache.c
               modules/generators mod_asis.c mod_autoindex.c
               modules/http http_protocol.c
               server   core.c
  Log:
    Changes to respect the new apr bucket and brigade length types (either
    apr_size_t for bucket lengths, or apr_off_t for aggregate brigade lengths.)
  
  Revision  Changes    Path
  1.59      +4 -1      httpd-2.0/modules/cache/mod_file_cache.c
  
  Index: mod_file_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/cache/mod_file_cache.c,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- mod_file_cache.c	2001/07/18 19:41:20	1.58
  +++ mod_file_cache.c	2001/07/24 20:38:01	1.59
  @@ -222,7 +222,10 @@
   
   #if APR_HAS_MMAP
       if (mmap) {
  -         /* MMAPFile directive. MMAP'ing the file */
  +        /* MMAPFile directive. MMAP'ing the file
  +         * XXX: APR_HAS_LARGE_FILES issue; need to reject this request if
  +         * size is greater than MAX(apr_size_t) (perhaps greater than 1M?).
  +         */
           if ((rc = apr_mmap_create(&new_file->mm, fd, 0, new_file->finfo.size,
                                     APR_MMAP_READ, cmd->pool)) != APR_SUCCESS) { 
               apr_file_close(fd);
  
  
  
  1.36      +3 -0      httpd-2.0/modules/generators/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_asis.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- mod_asis.c	2001/02/28 15:24:05	1.35
  +++ mod_asis.c	2001/07/24 20:38:01	1.36
  @@ -118,6 +118,9 @@
       }
   
       if (!r->header_only) {
  +        /* XXX: APR_HAS_LARGE_FILES issue; need to split into mutiple send_fd
  +         * chunks, no greater than MAX(apr_size_t).
  +         */
   	ap_send_fd(f, r, 0, r->finfo.size, &nbytes);
       }
   
  
  
  
  1.66      +1 -1      httpd-2.0/modules/generators/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_autoindex.c,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- mod_autoindex.c	2001/07/07 16:21:53	1.65
  +++ mod_autoindex.c	2001/07/24 20:38:01	1.66
  @@ -703,7 +703,7 @@
       char *icon;
       char *alt;
       char *desc;
  -    off_t size;
  +    apr_off_t size;
       apr_time_t lm;
       struct ent *next;
       int ascending, version_sort;
  
  
  
  1.332     +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.331
  retrieving revision 1.332
  diff -u -r1.331 -r1.332
  --- http_protocol.c	2001/07/24 17:24:05	1.331
  +++ http_protocol.c	2001/07/24 20:38:01	1.332
  @@ -883,7 +883,7 @@
   {
       char tmp[] = "X-Pad: avoid browser bug" CRLF;
       char crlf[] = CRLF;
  -    apr_ssize_t len;
  +    apr_off_t len;
       apr_size_t buflen;
   
       (void) apr_brigade_length(bb, 1, &len);
  @@ -2272,7 +2272,7 @@
       apr_off_t range_end;
       char *current;
       char *bound_head;
  -    apr_ssize_t bb_length;
  +    apr_off_t bb_length;
       apr_off_t clength = 0;
       apr_status_t rv;
       int found = 0;
  
  
  
  1.27      +5 -1      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- core.c	2001/07/18 20:45:35	1.26
  +++ core.c	2001/07/24 20:38:01	1.27
  @@ -2494,7 +2494,7 @@
       apr_size_t bytes_written = 0;
       apr_status_t rv;
       apr_size_t n = len;
  -    apr_size_t i = 0;
  +    int i = 0;
   
       *nbytes = 0;
   
  @@ -2996,6 +2996,10 @@
       }
   
       bb = apr_brigade_create(r->pool);
  +    /* XXX: APR_HAS_LARGE_FILES issue; need to split into mutiple buckets, 
  +     * no greater than MAX(apr_size_t), (perhaps more granular than that
  +     * in case the brigade code/filters attempt to read it!)
  +     */
       e = apr_bucket_file_create(fd, 0, r->finfo.size, r->pool);
   
       APR_BRIGADE_INSERT_HEAD(bb, e);
  
  
  

Mime
View raw message