[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-cvs
Subject:    cvs commit: httpd-2.0/server core.c
From:       rederpj () apache ! org
Date:       2004-01-30 16:20:52
Message-ID: 20040130162052.44330.qmail () minotaur ! apache ! org
[Download RAW message or body]

rederpj     2004/01/30 08:20:52

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               server   Tag: APACHE_2_0_BRANCH core.c
  Log:
  *) core.c: If large file support is enabled, allow any file that is
     greater than AP_MAX_SENDFILE to be split into multiple buckets.
     This allows Apache to send files that are greater than 2gig.
     Otherwise we run into 32/64 bit type mismatches in the file size.
  
  Submitted by: Brad Nicholes
  Reviewed by: nd, jerenkrantz, rederpj
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.230 +6 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.229
  retrieving revision 1.988.2.230
  diff -u -r1.988.2.229 -r1.988.2.230
  --- CHANGES	30 Jan 2004 15:52:07 -0000	1.988.2.229
  +++ CHANGES	30 Jan 2004 16:20:50 -0000	1.988.2.230
  @@ -1,5 +1,11 @@
   Changes with Apache 2.0.49
   
  +  *) core.c: If large file support is enabled, allow any file that is
  +     greater than AP_MAX_SENDFILE to be split into multiple buckets.
  +     This allows Apache to send files that are greater than 2gig.
  +     Otherwise we run into 32/64 bit type mismatches in the file size.
  +     [Brad Nicholes]
  +
     *) proxy_http fix: mod_proxy hangs when both KeepAlive and
        ProxyErrorOverride are enabled, and a non-200 response without a
        body is generated by the backend server. (e.g.: a client makes a
  
  
  
  1.751.2.665 +1 -8      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.664
  retrieving revision 1.751.2.665
  diff -u -r1.751.2.664 -r1.751.2.665
  --- STATUS	30 Jan 2004 15:52:07 -0000	1.751.2.664
  +++ STATUS	30 Jan 2004 16:20:50 -0000	1.751.2.665
  @@ -86,13 +86,6 @@
         jerenkrantz: Why is rm not application/vnd.rn-realmedia as in PR 26079?
         +1: nd, trawick
   
  -    * If large file support is enabled, allow any file that is greater than
  -      AP_MAX_SENDFILE to be split into multiple buckets. This allows Apache
  -      to send files that are greater than 2gig. Otherwise we run into 
  -      32/64 bit type mismatches in the file size.
  -      server/core.c r1.255, r1.256
  -      +1: bnicholes, nd, jerenkrantz
  -
       * Fix segfault in mod_mem_cache cache_insert() due to cache size
         becoming negative.  PR: 21285, 21287
         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/experimental/mod_mem_cache.c?r1=1.99&r2=1.100
  
  
  
  No                   revision
  No                   revision
  1.225.2.12 +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.225.2.11
  retrieving revision 1.225.2.12
  diff -u -r1.225.2.11 -r1.225.2.12
  --- core.c	1 Jan 2004 13:30:43 -0000	1.225.2.11
  +++ core.c	30 Jan 2004 16:20:51 -0000	1.225.2.12
  @@ -3522,8 +3522,12 @@
           }
   
           bb = apr_brigade_create(r->pool, c->bucket_alloc);
  -#if APR_HAS_SENDFILE && APR_HAS_LARGE_FILES
  +#if APR_HAS_LARGE_FILES
  +#if APR_HAS_SENDFILE
           if ((d->enable_sendfile != ENABLE_SENDFILE_OFF) &&
  +#else
  +        if (
  +#endif
               (r->finfo.size > AP_MAX_SENDFILE)) {
               /* APR_HAS_LARGE_FILES issue; must split into mutiple buckets,
                * no greater than MAX(apr_size_t), and more granular than that
  
  
  


[prev in list] [next in list] [prev in thread] [next in thread]