You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2016/08/16 21:48:09 UTC
svn commit: r1756553 - in /httpd/httpd/trunk: CHANGES
modules/cache/cache_storage.c modules/cache/cache_util.c
modules/cache/cache_util.h modules/cache/mod_cache.c
Author: ylavic
Date: Tue Aug 16 21:48:09 2016
New Revision: 1756553
URL: http://svn.apache.org/viewvc?rev=1756553&view=rev
Log:
mod_cache: Use the actual URI path and query-string for identifying the
cached entity (key), such that rewrites are taken into account when
running afterwards (CacheQuickHandler off). PR 21935.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/cache/cache_storage.c
httpd/httpd/trunk/modules/cache/cache_util.c
httpd/httpd/trunk/modules/cache/cache_util.h
httpd/httpd/trunk/modules/cache/mod_cache.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1756553&r1=1756552&r2=1756553&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Aug 16 21:48:09 2016
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
+ *) mod_cache: Use the actual URI path and query-string for identifying the
+ cached entity (key), such that rewrites are taken into account when
+ running afterwards (CacheQuickHandler off). PR 21935. [Yann Ylavic]
+
*) mod_ssl: Fix quick renegotiation (OptRenegotiaton) with no intermediate
in the client certificate chain. PR 55786. [Yann Ylavic]
Modified: httpd/httpd/trunk/modules/cache/cache_storage.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_storage.c?rev=1756553&r1=1756552&r2=1756553&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_storage.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_storage.c Tue Aug 16 21:48:09 2016
@@ -427,7 +427,9 @@ int cache_select(cache_request_rec *cach
}
static apr_status_t cache_canonicalise_key(request_rec *r, apr_pool_t* p,
- const char *uri, apr_uri_t *parsed_uri, const char **key)
+ const char *uri, const char *query,
+ apr_uri_t *parsed_uri,
+ const char **key)
{
cache_server_conf *conf;
char *port_str, *hn, *lcs;
@@ -563,7 +565,7 @@ static apr_status_t cache_canonicalise_k
* if needed.
*/
path = uri;
- querystring = parsed_uri->query;
+ querystring = apr_pstrdup(p, query ? query : parsed_uri->query);
if (conf->ignore_session_id->nelts) {
int i;
char **identifier;
@@ -588,7 +590,7 @@ static apr_status_t cache_canonicalise_k
/*
* Check if the identifier is in the querystring and cut it out.
*/
- if (querystring) {
+ if (querystring && *querystring) {
/*
* First check if the identifier is at the beginning of the
* querystring and followed by a '='
@@ -605,7 +607,7 @@ static apr_status_t cache_canonicalise_k
* identifier with a '&' and append a '='
*/
complete = apr_pstrcat(p, "&", *identifier, "=", NULL);
- param = strstr(querystring, complete);
+ param = ap_strstr_c(querystring, complete);
/* If we found something we are sitting on the '&' */
if (param) {
param++;
@@ -669,7 +671,11 @@ static apr_status_t cache_canonicalise_k
apr_status_t cache_generate_key_default(request_rec *r, apr_pool_t* p,
const char **key)
{
- return cache_canonicalise_key(r, p, r->uri, &r->parsed_uri, key);
+ /* We want the actual query-string, which may differ from
+ * r->parsed_uri.query (immutable), so use "" (not NULL).
+ */
+ const char *args = r->args ? r->args : "";
+ return cache_canonicalise_key(r, p, r->uri, args, &r->parsed_uri, key);
}
/*
@@ -709,12 +715,13 @@ int cache_invalidate(cache_request_rec *
location = apr_table_get(r->headers_out, "Location");
if (location) {
- if (APR_SUCCESS != apr_uri_parse(r->pool, location, &location_uri)
- || APR_SUCCESS
- != cache_canonicalise_key(r, r->pool, location,
- &location_uri, &location_key)
- || !(r->parsed_uri.hostname && location_uri.hostname
- && !strcmp(r->parsed_uri.hostname,
+ if (apr_uri_parse(r->pool, location, &location_uri)
+ || cache_canonicalise_key(r, r->pool,
+ location, NULL,
+ &location_uri, &location_key)
+ || !(r->parsed_uri.hostname
+ && location_uri.hostname
+ && !strcmp(r->parsed_uri.hostname,
location_uri.hostname))) {
location_key = NULL;
}
@@ -722,14 +729,15 @@ int cache_invalidate(cache_request_rec *
content_location = apr_table_get(r->headers_out, "Content-Location");
if (content_location) {
- if (APR_SUCCESS
- != apr_uri_parse(r->pool, content_location,
- &content_location_uri)
- || APR_SUCCESS
- != cache_canonicalise_key(r, r->pool, content_location,
- &content_location_uri, &content_location_key)
- || !(r->parsed_uri.hostname && content_location_uri.hostname
- && !strcmp(r->parsed_uri.hostname,
+ if (apr_uri_parse(r->pool, content_location,
+ &content_location_uri)
+ || cache_canonicalise_key(r, r->pool,
+ content_location, NULL,
+ &content_location_uri,
+ &content_location_key)
+ || !(r->parsed_uri.hostname
+ && content_location_uri.hostname
+ && !strcmp(r->parsed_uri.hostname,
content_location_uri.hostname))) {
content_location_key = NULL;
}
Modified: httpd/httpd/trunk/modules/cache/cache_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_util.c?rev=1756553&r1=1756552&r2=1756553&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.c Tue Aug 16 21:48:09 2016
@@ -31,8 +31,9 @@ extern module AP_MODULE_DECLARE_DATA cac
* in "filter". All but the path comparisons are case-insensitive.
*/
static int uri_meets_conditions(const apr_uri_t *filter, const int pathlen,
- const apr_uri_t *url)
+ request_rec *r)
{
+ const apr_uri_t *url = &r->parsed_uri;
/* Scheme, hostname port and local part. The filter URI and the
* URI we test may have the following shapes:
@@ -113,7 +114,7 @@ static int uri_meets_conditions(const ap
/* For HTTP caching purposes, an empty (NULL) path is equivalent to
* a single "/" path. RFCs 3986/2396
*/
- if (!url->path) {
+ if (!r->uri) {
if (*filter->path == '/' && pathlen == 1) {
return 1;
}
@@ -125,7 +126,7 @@ static int uri_meets_conditions(const ap
/* Url has met all of the filter conditions so far, determine
* if the paths match.
*/
- return !strncmp(filter->path, url->path, pathlen);
+ return !strncmp(filter->path, r->uri, pathlen);
}
static cache_provider_list *get_provider(request_rec *r, struct cache_enable *ent,
@@ -167,8 +168,7 @@ static cache_provider_list *get_provider
}
cache_provider_list *cache_get_providers(request_rec *r,
- cache_server_conf *conf,
- apr_uri_t uri)
+ cache_server_conf *conf)
{
cache_dir_conf *dconf = ap_get_module_config(r->per_dir_config, &cache_module);
cache_provider_list *providers = NULL;
@@ -183,7 +183,7 @@ cache_provider_list *cache_get_providers
for (i = 0; i < conf->cachedisable->nelts; i++) {
struct cache_disable *ent =
(struct cache_disable *)conf->cachedisable->elts;
- if (uri_meets_conditions(&ent[i].url, ent[i].pathlen, &uri)) {
+ if (uri_meets_conditions(&ent[i].url, ent[i].pathlen, r)) {
/* Stop searching now. */
return NULL;
}
@@ -200,7 +200,7 @@ cache_provider_list *cache_get_providers
for (i = 0; i < conf->cacheenable->nelts; i++) {
struct cache_enable *ent =
(struct cache_enable *)conf->cacheenable->elts;
- if (uri_meets_conditions(&ent[i].url, ent[i].pathlen, &uri)) {
+ if (uri_meets_conditions(&ent[i].url, ent[i].pathlen, r)) {
providers = get_provider(r, &ent[i], providers);
}
}
Modified: httpd/httpd/trunk/modules/cache/cache_util.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_util.h?rev=1756553&r1=1756552&r2=1756553&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.h (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.h Tue Aug 16 21:48:09 2016
@@ -300,7 +300,7 @@ apr_status_t cache_remove_lock(cache_ser
cache_request_rec *cache, request_rec *r, apr_bucket_brigade *bb);
cache_provider_list *cache_get_providers(request_rec *r,
- cache_server_conf *conf, apr_uri_t uri);
+ cache_server_conf *conf);
/**
* Get a value from a table, where the table may contain multiple
Modified: httpd/httpd/trunk/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.c?rev=1756553&r1=1756552&r2=1756553&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.c Tue Aug 16 21:48:09 2016
@@ -103,7 +103,7 @@ static int cache_quick_handler(request_r
/*
* Which cache module (if any) should handle this request?
*/
- if (!(providers = cache_get_providers(r, conf, r->parsed_uri))) {
+ if (!(providers = cache_get_providers(r, conf))) {
return DECLINED;
}
@@ -413,7 +413,7 @@ static int cache_handler(request_rec *r)
/*
* Which cache module (if any) should handle this request?
*/
- if (!(providers = cache_get_providers(r, conf, r->parsed_uri))) {
+ if (!(providers = cache_get_providers(r, conf))) {
return DECLINED;
}