summaryrefslogtreecommitdiff
path: root/modules/cache/cache_storage.c
diff options
context:
space:
mode:
authorChristophe Jaillet <jailletc36@apache.org>2013-03-04 13:02:09 +0000
committerChristophe Jaillet <jailletc36@apache.org>2013-03-04 13:02:09 +0000
commit523996f1f656719571dc3f0ef664427fc8efbfac (patch)
tree0f93ba988f1cffb3375505ed6a0fe904e496f250 /modules/cache/cache_storage.c
parentb6cdb032b37b4dc18a45f19bd4a875e15fa7cb2c (diff)
downloadhttpd-523996f1f656719571dc3f0ef664427fc8efbfac.tar.gz
cache_storage: remove useless test + update function name in debug log + skip as soon as we know headers do not match
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1452281 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/cache/cache_storage.c')
-rw-r--r--modules/cache/cache_storage.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index e9363896bc..179c79e69c 100644
--- 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;
}
}