minor #7619 Making it more clear where Request::setTrustedProxies should go (weaverryan)

weaverryan · weaverryan · commit 613e5c44d07d · 2017-03-15T15:08:27.000-04:00
This PR was merged into the 2.7 branch. Discussion ---------- Making it more clear where Request::setTrustedProxies should go ... And trying out the `diff` format! I know we lose the `php` formatting, but in this case, it seems superior. Commits ------- 869e5d2 Making it more clear where to add the Request::setTrustedProxies line
diff --git a/request/load_balancer_reverse_proxy.rst b/request/load_balancer_reverse_proxy.rst
@@ -82,14 +82,16 @@ In this case, you'll need to - *very carefully* - trust *all* proxies.
 
 #. Once you've guaranteed that traffic will only come from your trusted reverse
    proxies, configure Symfony to *always* trust incoming request. This is
-   done inside of your front controller::
+   done inside of your front controller:
+
+.. code-block:: diff
 
        // web/app.php
 
        // ...
-       Request::setTrustedProxies(array('127.0.0.1', $request->server->get('REMOTE_ADDR')));
+       $request = Request::createFromGlobals();
+       + Request::setTrustedProxies(array('127.0.0.1', $request->server->get('REMOTE_ADDR')));
 
-       $response = $kernel->handle($request);
        // ...
 
 #. Ensure that the trusted_proxies setting in your ``app/config/config.yml``
