Merge branch '4.0' into 4.1

nicolas-grekas · nicolas-grekas · commit 7d93e3547660 · 2018-08-01T16:07:44.000+02:00
* 4.0:
  [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
diff --git a/Request.php b/Request.php
@@ -1943,7 +1943,7 @@ private function getTrustedValues($type, $ip = null)
             foreach ($parts as $subParts) {
                 $assoc = HeaderUtils::combine($subParts);
                 if (isset($assoc[$param])) {
-                    $forwardedValues[] = $assoc[$param];
+                    $forwardedValues[] = self::HEADER_X_FORWARDED_PORT === $type ? substr_replace($assoc[$param], '0.0.0.0', 0, strrpos($assoc[$param], ':')) : $assoc[$param];
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1943,7 +1943,7 @@ private function getTrustedValues($type, $ip = null)`
`1943`	`1943`	`foreach ($parts as $subParts) {`
`1944`	`1944`	`$assoc = HeaderUtils::combine($subParts);`
`1945`	`1945`	`if (isset($assoc[$param])) {`
`1946`		`- $forwardedValues[] = $assoc[$param];`
	`1946`	`+ $forwardedValues[] = self::HEADER_X_FORWARDED_PORT === $type ? substr_replace($assoc[$param], '0.0.0.0', 0, strrpos($assoc[$param], ':')) : $assoc[$param];`
`1947`	`1947`	`}`
`1948`	`1948`	`}`
`1949`	`1949`	`}`