Merge branch '2.8' into 3.4

* 2.8: [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
symfony · Aug 1, 2018 · 19a3267 · 19a3267
2 parents b00b9ce + 10f660d
commit 19a3267
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Request.php b/Request.php
@@ -2087,6 +2087,11 @@ private function getTrustedValues($type, $ip = null)
         if (self::$trustedHeaders[self::HEADER_FORWARDED] && $this->headers->has(self::$trustedHeaders[self::HEADER_FORWARDED])) {
             $forwardedValues = $this->headers->get(self::$trustedHeaders[self::HEADER_FORWARDED]);
             $forwardedValues = preg_match_all(sprintf('{(?:%s)=(?:"?\[?)([a-zA-Z0-9\.:_\-/]*+)}', self::$forwardedParams[$type]), $forwardedValues, $matches) ? $matches[1] : array();
+            if (self::HEADER_CLIENT_PORT === $type) {
+                foreach ($forwardedValues as $k => $v) {
+                    $forwardedValues[$k] = substr_replace($v, '0.0.0.0', 0, strrpos($v, ':'));
+                }
+            }
         }
 
         if (null !== $ip) {