From: Stefan Eissing <icing@apache.org>
Date: Thu, 18 Jul 2019 13:57:04 +0000 (+0000)
Subject: Merge of r1851146 from trunk:
X-Git-Tag: 2.4.40~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19b6a06810145d6ead81bb9a0998f87b0225caf6;p=thirdparty%2Fapache%2Fhttpd.git

Merge of r1851146 from trunk:

  *) cache_storage: be consistent when building a cache key value when CacheKeyBaseURL is used with
                    an URL that contains a :port.
                    PR 53915 [Rein Tollevik <rein basefarm.no>]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1863317 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 54913c9dfbc..609efb1dd7a 100644
--- a/STATUS
+++ b/STATUS
@@ -127,13 +127,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) cache_storage: be consistent when building a cache key value when CacheKeyBaseURL is used with
-                    an URL that contains a :port.
-                    PR 53915 [Rein Tollevik <rein basefarm.no>]
-     trunk: http://svn.apache.org/r1851146
-     2.4.x patch: svn merge -c 1851146 ^/httpd/httpd/trunk .
-     +1: jailletc36, jim, icing
-
   *) mod_proxy_hcheck fix for BZ 60948
      trunk: http://svn.apache.org/r1862014
      2.4.x: svn merge -c 1862014 ^/httpd/httpd/trunk .
diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index 41f638c025c..dfda34b1c1d 100644
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
@@ -270,8 +270,7 @@ int cache_select(cache_request_rec *cache, request_rec *r)
              * language negotiated document in a different language by mistake.
              *
              * This code makes the assumption that the storage manager will
-             * cache the req_hdrs if the response contains a Vary
-             * header.
+             * cache the req_hdrs if the response contains a Vary header.
              *
              * RFC2616 13.6 and 14.44 describe the Vary mechanism.
              */
@@ -549,7 +548,7 @@ static apr_status_t cache_canonicalise_key(request_rec *r, apr_pool_t* p,
     }
     else {
         if (conf->base_uri && conf->base_uri->port_str) {
-            port_str = conf->base_uri->port_str;
+            port_str = apr_pstrcat(p, ":", conf->base_uri->port_str, NULL);
         }
         else if (conf->base_uri && conf->base_uri->hostname) {
             port_str = "";