Commit 523d8a51 authored by Graham Leggett's avatar Graham Leggett
Browse files

mod_cache: Eliminate a bogus error in the log when a filter returns 

AP_FILTER_ERROR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@450453 13f79535-47bb-0310-9956-ffa450edef68
parent c8da5470

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]









  *) mod_cache: Eliminate a bogus error in the log when a filter returns









     AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]

















  *) mod_disk_cache: Make caching of large files possible on 32bit machines









     by determining whether the cached file should be copied on disk rather









     than loaded into RAM. PR39380 [Niklas Edmundsson <nikke acc.umu.se>]


































modules/cache/mod_cache.c



+2
−0



























Changes for modules/cache/mod_cache.c: 2 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -244,10 +244,12 @@ static int cache_url_handler(request_rec *r, int lookup)







    out = apr_brigade_create(r->pool, r->connection->bucket_alloc);









    rv = ap_pass_brigade(r->output_filters, out);









    if (rv != APR_SUCCESS) {









        if(rv != AP_FILTER_ERROR) {









            ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,









                         "cache: error returned while trying to return %s "









                         "cached data",









                         cache->provider_name);









        }









        return rv;









    }