You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2007/05/17 23:03:05 UTC
svn commit: r539112 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/cache/cache_storage.c modules/cache/mod_cache.h
Author: rpluem
Date: Thu May 17 14:03:04 2007
New Revision: 539112
URL: http://svn.apache.org/viewvc?view=rev&rev=539112
Log:
Merge r506621 from trunk:
* Save the key we generate during our first run of cache_generate_key_default
on each request in the request_config. During consecutive runs of
cache_generate_key_default during processing the request we restore it
from there as we might not be able to generate the same key again as
the ingredients used to compose the key might have changed and we constantly
must use a key that could be generated during the quick handler phase.
PR: 41475
Submitted by: rpluem
Reviewed by: rpluem, jerenkrantz, jim
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/cache/cache_storage.c
httpd/httpd/branches/2.2.x/modules/cache/mod_cache.h
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=539112&r1=539111&r2=539112
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu May 17 14:03:04 2007
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.5
+ *) mod_cache: Use the same cache key throughout the whole request processing
+ to handle escaped URLs correctly. PR 41475. [Ruediger Pluem]
+
*) mod_cache: Add CacheIgnoreQueryString directive. PR 41484.
[Fredrik Widlund <fredrik.widlund qbrick.com>]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=539112&r1=539111&r2=539112
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu May 17 14:03:04 2007
@@ -105,30 +105,6 @@
http://svn.apache.org/viewvc?view=rev&rev=520733
+1: wrowe, rpluem, niq
- * mod_cache: Correctly cache and recall entities whose request URL's
- are url-escaped.
- PR: 41475
- Trunk version of patch:
- http://svn.apache.org/viewvc?view=rev&revision=506621
- 2.2.x version of patch:
- Trunk version works
- +1: rpluem, jerenkrantz, jim
- wrowe asks - is there a disambiguation problem here? The items
- in the cache should either entirely be escaped or unescaped.
- Can't violate the applicable canonicalization. However, if this
- simply allows escaped entities that are unambiguously their
- non-path, special values, (e.g. '/' vs %2F the character)
- then I'm strongly +1.
- rpluem says: Sorry for the confusing title. This is more about
- the fact that the URL of the request is subject to several
- transformations that are applied *after* the quick handler phase
- (unescaping, possibly mod_rewrite, etc.).
- As we use the URL to calculate the cache key this can lead to situations
- where we save an entity to the cache under a different key in the
- CACHE_SAVE filter then the key we use to request the entity from the
- cache during the quick handler phase. If there are still questions
- we should continue the discussion on the list.
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
* ApacheMonitor: Fix Windows Vista detection.
Modified: httpd/httpd/branches/2.2.x/modules/cache/cache_storage.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/cache_storage.c?view=diff&rev=539112&r1=539111&r2=539112
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/cache_storage.c (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/cache_storage.c Thu May 17 14:03:04 2007
@@ -332,10 +332,30 @@
char**key)
{
cache_server_conf *conf;
+ cache_request_rec *cache;
char *port_str, *hn, *lcs;
const char *hostname, *scheme;
int i;
+ cache = (cache_request_rec *) ap_get_module_config(r->request_config,
+ &cache_module);
+ if (!cache) {
+ /* This should never happen */
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
+ "cache: No cache request information available for key"
+ " generation");
+ *key = "";
+ return APR_EGENERAL;
+ }
+ if (cache->key) {
+ /*
+ * We have been here before during the processing of this request.
+ * So return the key we already have.
+ */
+ *key = apr_pstrdup(p, cache->key);
+ return APR_SUCCESS;
+ }
+
/*
* Get the module configuration. We need this for the CacheIgnoreQueryString
* option below.
@@ -442,6 +462,16 @@
*key = apr_pstrcat(p, scheme, "://", hostname, port_str,
r->parsed_uri.path, "?", r->parsed_uri.query, NULL);
}
+
+ /*
+ * Store the key in the request_config for the cache as r->parsed_uri
+ * might have changed in the time from our first visit here triggered by the
+ * quick handler and our possible second visit triggered by the CACHE_SAVE
+ * filter (e.g. r->parsed_uri got unescaped). In this case we would save the
+ * resource in the cache under a key where it is never found by the quick
+ * handler during following requests.
+ */
+ cache->key = apr_pstrdup(r->pool, *key);
return APR_SUCCESS;
}
Modified: httpd/httpd/branches/2.2.x/modules/cache/mod_cache.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/mod_cache.h?view=diff&rev=539112&r1=539111&r2=539112
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/mod_cache.h (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/mod_cache.h Thu May 17 14:03:04 2007
@@ -234,6 +234,9 @@
apr_time_t lastmod; /* last-modified time */
cache_info *info; /* current cache info */
ap_filter_t *remove_url_filter; /* Enable us to remove the filter */
+ char *key; /* The cache key created for this
+ * request
+ */
} cache_request_rec;