Commit e895a617 authored by Joe Orton's avatar Joe Orton
Browse files

Merge r105111 from trunk: 

* server/core.c (default_handler): Fix the test for whether to split a
file into several buckets: it is needed regardless of whether sendfile
is enabled, and APR_HAS_LARGE_FILES is not sufficient to determine
whether sizeof(apr_off_t) is greater than sizeof(apr_off_t).

PR: 28898
Reviewed by: jorton, trawick, stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@125748 13f79535-47bb-0310-9956-ffa450edef68
parent 5dd60fc0

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.0.53









  *) Fix handling of files >2Gb on all platforms (or builds) where









     apr_off_t is larger than apr_size_t.  PR 28898.  [Joe Orton]

















  *) mod_include: Fix bug which could truncate variable expansions









     of N*64 characters by one byte.  PR 32985.  [Joe Orton]










































STATUS



+0
−6



























Changes for STATUS: 0 added lines, 6 removed lines.



Original line number
Diff line number
Diff line







@@ -94,12 +94,6 @@ PATCHES TO BACKPORT FROM 2.1







       PR: 32529









       +1: jorton



















    *) core: fix bucket-splitting logic for platforms with









       sizeof(apr_off_t)>sizeof(apr_size_t)









       http://www.apache.org/~jorton/ap_splitlfs.diff









       PR: 28898









       +1: jorton, trawick, stoddard



















    *) modules/config5.m4 & docs/manual/programs/configure.xml:









       --with-module can now take more than one module to be statically









       linked:


































server/core.c



+7
−12



























Changes for server/core.c: 7 added lines, 12 removed lines.



Original line number
Diff line number
Diff line







@@ -3580,17 +3580,13 @@ static int default_handler(request_rec *r)







        }



















        bb = apr_brigade_create(r->pool, c->bucket_alloc);









#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









             * in case the brigade code/filters attempt to read it directly.









             */



















        /* For platforms where the size of the file may be larger than









         * that which can be stored in a single bucket (whether the









         * length field is an apr_size_t), split it into several









         * buckets */









        if (sizeof(apr_off_t) > sizeof(apr_size_t) 









            && r->finfo.size > AP_MAX_SENDFILE) {









            apr_off_t fsize = r->finfo.size;









            e = apr_bucket_file_create(fd, 0, AP_MAX_SENDFILE, r->pool,









                                       c->bucket_alloc);










@@ -3604,7 +3600,6 @@ static int default_handler(request_rec *r)







            e->length = (apr_size_t)fsize; /* Resize just the last bucket */









        }









        else









#endif









            e = apr_bucket_file_create(fd, 0, (apr_size_t)r->finfo.size,









                                       r->pool, c->bucket_alloc);