*) 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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@102467 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 012d44e2662c131ecddb4ed890a35ba394e4fc34..959a5b75d60d87c453e2f415636ec454575f11c1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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

diff --git a/STATUS b/STATUS
index 88bbf62f6c92504a52ae486a76fcd78411a6ec42..a11bc7cf9d250d5144a9205b936cd754e4c590fa 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/01/30 15:52:07 $]
+Last modified at [$Date: 2004/01/30 16:20:50 $]
 
 Release:
 
@@ -86,13 +86,6 @@ PATCHES TO BACKPORT FROM 2.1
       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

diff --git a/server/core.c b/server/core.c
index 1670b68e781e04bf0c189b6260f90e70c96da580..c34beb03583c4d908f41b46c44965efda9c11213 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -3522,8 +3522,12 @@ static int default_handler(request_rec *r)
         }
 
         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