Merge branch '3.4' into 4.0

* 3.4: [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
symfony · Aug 1, 2018 · 7dc9f88 · 7dc9f88
2 parents e5a8475 + 19a3267
commit 7dc9f88
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Request.php b/Request.php
@@ -1941,6 +1941,11 @@ private function getTrustedValues($type, $ip = null)
         if ((self::$trustedHeaderSet & 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_X_FORWARDED_PORT === $type) {
+                foreach ($forwardedValues as $k => $v) {
+                    $forwardedValues[$k] = substr_replace($v, '0.0.0.0', 0, strrpos($v, ':'));
+                }
+            }
         }
 
         if (null !== $ip) {