Merge r1452281 from trunk:

cache_storage: remove useless test + update function name in debug log + skip as soon as we know headers do not match
Submitted by: jailletc36
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index a1d4fe5d451ff5acd4499e8e566cc8e221230de2..55e4a88e26e05f8326d587f1ecb64820497c9933 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,12 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * cache_storage: remove useless test + update function name in debug log +
-    skip as soon as we know headers do not match
-    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1452281
-    2.4.x patch: trunk patch works
-    +1: jailletc36, rjung, covener
-
   * use %pm instead of explicit call to apr_strerror (more to be backported but they don't
     apply out of the box for now)
     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1463750

diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index 9021ec1df3282082d608580e2786124b82f37803..dc51ca5b4d76ec76a27b5966fe70b2b04259af2c 100644 (file)
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
@@ -263,7 +263,7 @@ int cache_select(cache_request_rec *cache, request_rec *r)
                 /* isolate header name */
                 while (*vary && !apr_isspace(*vary) && (*vary != ','))
                     ++vary;
-                while (*vary && (apr_isspace(*vary) || (*vary == ','))) {
+                while (apr_isspace(*vary) || (*vary == ',')) {
                     *vary = '\0';
                     ++vary;
                 }
@@ -283,8 +283,9 @@ int cache_select(cache_request_rec *cache, request_rec *r)
                 else {
                     /* headers do not match, so Vary failed */
                     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS,
-                            r, APLOGNO(00694) "cache_select_url(): Vary header mismatch.");
+                            r, APLOGNO(00694) "cache_select(): Vary header mismatch.");
                     mismatch = 1;
+                    break;
                 }
             }