httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r483974 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/cache/mod_cache.c
Date Fri, 08 Dec 2006 12:56:01 GMT
Author: trawick
Date: Fri Dec  8 04:56:00 2006
New Revision: 483974

URL: http://svn.apache.org/viewvc?view=rev&rev=483974
Log:
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
  

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/cache/mod_cache.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=483974&r1=483973&r2=483974
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Dec  8 04:56:00 2006
@@ -1,6 +1,9 @@
                                                         -*- 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]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=483974&r1=483973&r2=483974
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Dec  8 04:56:00 2006
@@ -211,11 +211,6 @@
       +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

Modified: httpd/httpd/branches/2.2.x/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/mod_cache.c?view=diff&rev=483974&r1=483973&r2=483974
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/mod_cache.c (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/mod_cache.c Fri Dec  8 04:56:00 2006
@@ -225,10 +225,12 @@
     out = apr_brigade_create(r->pool, r->connection->bucket_alloc);
     rv = ap_pass_brigade(r->output_filters, out);
     if (rv != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
-                     "cache: error returned while trying to return %s "
-                     "cached data",
-                     cache->provider_name);
+        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;
     }
 



Mime
View raw message