Commit ced04e5e authored by Jeff Trawick's avatar Jeff Trawick
Browse files

merge from trunk: 

  *) mod_cache: Eliminate a bogus error in the log when a filter returns
     AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]

Reviewed by: minfrin, wrowe, trawick
  


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483974 13f79535-47bb-0310-9956-ffa450edef68
parent 13b81a73

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.4









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









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

















  *) Fix issue which could cause piped loggers to be orphaned and never









     terminate after a graceful restart.  PR 40651.  [Joe Orton,









     Ruediger Pluem]


































STATUS



+0
−5



























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



Original line number
Diff line number
Diff line







@@ -211,11 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:







      +1: minfrin, jim, wrowe









        wrowe asks; should ptr mobj->m be nulled out for safety's sake?



















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









      AP_FILTER_ERROR.









      Trunk: http://svn.apache.org/viewvc?view=rev&rev=450453









      +1: minfrin, wrowe



















    * mod_authnz_ldap: Add an AuthLDAPRemoteUserAttribute directive. If









      set, REMOTE_USER will be set to this attribute, rather than the









      username supplied by the user. Useful for example when you want users


































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







@@ -225,10 +225,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;









    }