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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1507682 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 7e0f9c52f5586aabaed16dacc8f67ab0c09cd03d..840a27559c944e002ea4976ef8fb596d766b62e4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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:

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 06bdf460d1356f49d579d61a2866a1a648f18dec..6052116e77059e92b80d340dd5e5dacd75e01d83 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1171,8 +1171,10 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
      */
     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,