cache_storage: remove useless test + update function name in debug log + skip as...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1452281 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index e9363896bc17e4a0b72f5d14b378cef4a176b41c..179c79e69c0ef6df3251993a43f77ec9d10b6be6 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;
                 }
             }