Merge branch '3.4' into 4.3

OskarStark · OskarStark · commit 4650062f561e · 2019-08-16T08:04:04.000+02:00
* 3.4: Tweaks #12117 add support for custom headers when using a proxy
diff --git a/deployment/proxies.rst b/deployment/proxies.rst
@@ -76,4 +76,22 @@ That's it! It's critical that you prevent traffic from all non-trusted sources.
 If you allow outside traffic, they could "spoof" their true IP address and
 other information.
 
+Custom Headers When Using a Reverse Proxy
+-----------------------------------------
+
+Some reverse proxies (like `CloudFront`_ with ``CloudFront-Forwarded-Proto``) may force you to use a custom header.
+For instance you have ``Custom-Forwarded-Proto`` instead of ``X-Forwarded-Proto``.
+
+In this case, you'll need to set the header ``X-Forwarded-Proto`` with the value of
+``Custom-Forwarded-Proto`` early enough in your application, i.e. before handling the request::
+
+    // web/app.php
+
+    // ...
+    $_SERVER['HEADER_X_FORWARDED_PROTO'] = $_SERVER['HEADER_CUSTOM_FORWARDED_PROTO'];
+    // ...
+    $response = $kernel->handle($request);
+
 .. _`security groups`: http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-security-groups.html
+.. _`RFC 7239`: http://tools.ietf.org/html/rfc7239
+.. _`CloudFront`: https://en.wikipedia.org/wiki/Amazon_CloudFront
