You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/04/15 14:38:36 UTC
svn commit: r1467976 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/cache/cache_storage.c
Author: jim
Date: Mon Apr 15 12:38:36 2013
New Revision: 1467976
URL: http://svn.apache.org/r1467976
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/cache/cache_storage.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1452281
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1467976&r1=1467975&r2=1467976&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Apr 15 12:38:36 2013
@@ -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
Modified: httpd/httpd/branches/2.4.x/modules/cache/cache_storage.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/cache_storage.c?rev=1467976&r1=1467975&r2=1467976&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/cache_storage.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/cache_storage.c Mon Apr 15 12:38:36 2013
@@ -263,7 +263,7 @@ int cache_select(cache_request_rec *cach
/* 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 *cach
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;
}
}