Merge branch '4.0' into 4.1

* 4.0:
  [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer

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];
                 }
             }
         }