You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2006/01/23 20:26:07 UTC
svn commit: r371633 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS
modules/experimental/mod_cache.c
Author: colm
Date: Mon Jan 23 11:26:00 2006
New Revision: 371633
URL: http://svn.apache.org/viewcvs?rev=371633&view=rev
Log:
Merge r180341 from trunk:
* Fix handling of "Vary: *" in mod_cache.
Submitted by: pquerna
Modified:
httpd/httpd/branches/2.0.x/CHANGES
httpd/httpd/branches/2.0.x/STATUS
httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c
Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=371633&r1=371632&r2=371633&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Mon Jan 23 11:26:00 2006
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.0.56
+ *) mod_cache: Fix 'Vary: *' behavior to be RFC compliant. PR 16125.
+ [Paul Querna]
+
*) Remove the base href tag from proxy_ftp, as it breaks relative
links for clients not using an Authorization header. [Graham Leggett,
Jon Snow <jsnow27 gatesec.net>]
Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=371633&r1=371632&r2=371633&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Mon Jan 23 11:26:00 2006
@@ -133,13 +133,6 @@
http://svn.apache.org/viewcvs?view=rev&rev=154319
+1: stoddard, striker, wrowe (as corrected in subsequent patches)
- *) mod_cache: Fix handling of 'Vary: *". PR 16125.
- Trunk: r180341
- 2.0.x Patch: http://issues.apache.org/bugzilla/attachment.cgi?id=15297
- +1: pquerna, jerenkrantz, colm
- jerenkrantz notes: I do prefer the version from r190033 (own if check).
-
-
*) mod_mime_magic: Handle CRLF-format^H^H^H^H^H^H^H magic files
with any trailing whitespace so that it works with the
default installation on Windows.
Modified: httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c?rev=371633&r1=371632&r2=371633&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c (original)
+++ httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c Mon Jan 23 11:26:00 2006
@@ -256,7 +256,7 @@
cache_request_rec *cache;
cache_server_conf *conf;
char *url = r->unparsed_uri;
- const char *cc_in, *cc_out, *cl;
+ const char *cc_in, *cc_out, *cl, *vary_out;
const char *exps, *lastmods, *dates, *etag;
apr_time_t exp, date, lastmod, now;
apr_off_t size;
@@ -267,7 +267,9 @@
/* check first whether running this filter has any point or not */
/* If the user has Cache-Control: no-store from RFC 2616, don't store! */
cc_in = apr_table_get(r->headers_in, "Cache-Control");
- if (r->no_cache || ap_cache_liststr(NULL, cc_in, "no-store", NULL)) {
+ vary_out = apr_table_get(r->headers_out, "Vary");
+ if (r->no_cache || ap_cache_liststr(NULL, cc_in, "no-store", NULL) ||
+ ap_cache_liststr(NULL, vary_out, "*", NULL)) {
ap_remove_output_filter(f);
return ap_pass_brigade(f->next, in);
}