httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1507682 - in /httpd/httpd/branches/2.4.x: ./ STATUS docs/manual/ docs/manual/howto/ docs/manual/mod/ docs/manual/rewrite/ modules/cache/mod_cache.c
Date Sat, 27 Jul 2013 16:17:07 GMT
Author: jim
Date: Sat Jul 27 16:17:07 2013
New Revision: 1507682

URL: http://svn.apache.org/r1507682
Log:
Merge r1481396, r1502665 from trunk:

update log tags

replace duplicate, add missing


reflow a very long line, no functional change

Submitted by: sf, covener
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/docs/manual/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/howto/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/mod/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/rewrite/   (props changed)
    httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1481396,1502665

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1507682&r1=1507681&r2=1507682&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Jul 27 16:17:07 2013
@@ -93,12 +93,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-  * mod_cache: fill in APLOGNO value
-    trunk: http://svn.apache.org/r1481396
-           http://svn.apache.org/r1502665
-    2.4.x patch: Applicable parts of above only: 
-                 http://people.apache.org/~covener/patches/2.4.x-cache_err.diff
-    +1: covener (I reset the votes due to the # of conflicts in the trunk revs), jailletc36,
trawick
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

Propchange: httpd/httpd/branches/2.4.x/docs/manual/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual:r1481396,1502665

Propchange: httpd/httpd/branches/2.4.x/docs/manual/howto/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual/howto:r1481396,1502665

Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual/mod:r1481396,1502665

Propchange: httpd/httpd/branches/2.4.x/docs/manual/rewrite/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual/rewrite:r1481396,1502665

Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c?rev=1507682&r1=1507681&r2=1507682&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c Sat Jul 27 16:17:07 2013
@@ -1171,8 +1171,10 @@ static apr_status_t cache_save_filter(ap
      */
     if (reason && r->status == HTTP_NOT_MODIFIED && cache->stale_handle)
{
 
-        ap_log_rerror(
-                APLOG_MARK, APLOG_INFO, 0, r, APLOGNO() "cache: %s responded with an uncacheable
304, retrying the request. Reason: %s", r->unparsed_uri, reason);
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02473) 
+                "cache: %s responded with an uncacheable 304, " 
+                "retrying the request. Reason: %s", 
+                r->unparsed_uri, reason);
 
         /* we've got a cache conditional miss! tell anyone who cares */
         cache_run_cache_status(cache->handle, r, r->headers_out, AP_CACHE_MISS,



Mime
View raw message