Blame SOURCES/httpd-2.4.6-CVE-2013-4352.patch
|
 |
008793 |
--- a/modules/cache/cache_storage.c 2013/09/14 13:30:39 1523234
|
|
|
008793 |
+++ b/modules/cache/cache_storage.c 2013/09/14 13:32:25 1523235
|
|
|
008793 |
@@ -713,7 +713,9 @@
|
|
|
008793 |
|| APR_SUCCESS
|
|
|
008793 |
!= cache_canonicalise_key(r, r->pool, location,
|
|
|
008793 |
&location_uri, &location_key)
|
|
|
008793 |
- || strcmp(r->parsed_uri.hostname, location_uri.hostname)) {
|
|
|
008793 |
+ || !(r->parsed_uri.hostname && location_uri.hostname
|
|
|
008793 |
+ && !strcmp(r->parsed_uri.hostname,
|
|
|
008793 |
+ location_uri.hostname))) {
|
|
|
008793 |
location_key = NULL;
|
|
|
008793 |
}
|
|
|
008793 |
}
|
|
|
008793 |
@@ -726,8 +728,9 @@
|
|
|
008793 |
|| APR_SUCCESS
|
|
|
008793 |
!= cache_canonicalise_key(r, r->pool, content_location,
|
|
|
008793 |
&content_location_uri, &content_location_key)
|
|
|
008793 |
- || strcmp(r->parsed_uri.hostname,
|
|
|
008793 |
- content_location_uri.hostname)) {
|
|
|
008793 |
+ || !(r->parsed_uri.hostname && content_location_uri.hostname
|
|
|
008793 |
+ && !strcmp(r->parsed_uri.hostname,
|
|
|
008793 |
+ content_location_uri.hostname))) {
|
|
|
008793 |
content_location_key = NULL;
|
|
|
008793 |
}
|
|
|
008793 |
}
|