On 10/27/2006 03:28 PM, [EMAIL PROTECTED] wrote: > Author: minfrin > Date: Fri Oct 27 06:28:56 2006 > New Revision: 468373 > > URL: http://svn.apache.org/viewvc?view=rev&rev=468373 > Log: > mod_cache: Pass the output filter stack through the store_body() > hook, giving each cache backend the ability to make a better > decision as to how it will allocate the tasks of writing to the > cache and writing to the network. Previously the write to the > cache task needed to be complete before the same brigade was > written to the network, and this caused timing and memory issues > on large cached files. This fix replaces the previous fix for > PR39380. >
> > Modified: httpd/httpd/trunk/modules/cache/mod_disk_cache.c > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?view=diff&rev=468373&r1=468372&r2=468373 > ============================================================================== > --- httpd/httpd/trunk/modules/cache/mod_disk_cache.c (original) > +++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c Fri Oct 27 06:28:56 2006 > @@ -1286,9 +1292,15 @@ > static apr_status_t open_new_file(request_rec *r, const char *filename, > apr_file_t **fd, disk_cache_conf *conf) > { > - int flags = APR_CREATE | APR_WRITE | APR_BINARY | APR_BUFFERED | > APR_EXCL; > + int flags; > apr_status_t rv; > > + flags = APR_CREATE | APR_WRITE | APR_READ | APR_BINARY | APR_BUFFERED | > APR_EXCL | APR_TRUNCATE; > +#if APR_HAS_SENDFILE > + flags |= ((pdconf->enable_sendfile == ENABLE_SENDFILE_OFF) > + ? 0 : APR_SENDFILE_ENABLED); > +#endif > + This breaks compilation of mod_disk_cache on systems that have APR_HAS_SENDFILE set. Regards Rüdiger
