You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
1.2 KiB
26 lines
1.2 KiB
6 years ago
|
--- a/modules/cache/cache_storage.c 2013/09/14 13:30:39 1523234
|
||
|
|
+++ b/modules/cache/cache_storage.c 2013/09/14 13:32:25 1523235
|
||
|
|
@@ -713,7 +713,9 @@
|
||
|
|
|| APR_SUCCESS
|
||
|
|
!= cache_canonicalise_key(r, r->pool, location,
|
||
|
|
&location_uri, &location_key)
|
||
|
|
- || strcmp(r->parsed_uri.hostname, location_uri.hostname)) {
|
||
|
|
+ || !(r->parsed_uri.hostname && location_uri.hostname
|
||
|
|
+ && !strcmp(r->parsed_uri.hostname,
|
||
|
|
+ location_uri.hostname))) {
|
||
|
|
location_key = NULL;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -726,8 +728,9 @@
|
||
|
|
|| APR_SUCCESS
|
||
|
|
!= cache_canonicalise_key(r, r->pool, content_location,
|
||
|
|
&content_location_uri, &content_location_key)
|
||
|
|
- || strcmp(r->parsed_uri.hostname,
|
||
|
|
- content_location_uri.hostname)) {
|
||
|
|
+ || !(r->parsed_uri.hostname && content_location_uri.hostname
|
||
|
|
+ && !strcmp(r->parsed_uri.hostname,
|
||
|
|
+ content_location_uri.hostname))) {
|
||
|
|
content_location_key = NULL;
|
||
|
|
}
|
||
|
|
}
|