Skip to content

Commit 66e9c31

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: Minor RST syntax fix Minor RST syntax fix
2 parents aad29b7 + e499df3 commit 66e9c31

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

deployment/proxies.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ In this case, you'll need to - *very carefully* - trust *all* proxies.
126126
#. Once you've guaranteed that traffic will only come from your trusted reverse
127127
proxies, configure Symfony to *always* trust incoming request:
128128

129-
.. code-block:: yaml
130-
131-
# config/packages/framework.yaml
132-
framework:
133-
# ...
134-
# trust *all* requests (the 'REMOTE_ADDR' string is replaced at
135-
# run time by $_SERVER['REMOTE_ADDR'])
136-
trusted_proxies: '127.0.0.1,REMOTE_ADDR'
129+
.. code-block:: yaml
130+
131+
# config/packages/framework.yaml
132+
framework:
133+
# ...
134+
# trust *all* requests (the 'REMOTE_ADDR' string is replaced at
135+
# run time by $_SERVER['REMOTE_ADDR'])
136+
trusted_proxies: '127.0.0.1,REMOTE_ADDR'
137137
138138
That's it! It's critical that you prevent traffic from all non-trusted sources.
139139
If you allow outside traffic, they could "spoof" their true IP address and

reference/map.rst.inc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ Ever wondered what configuration options you have available to you in
66
configuration is broken down by the key (e.g. ``framework``) that defines
77
each possible section of your Symfony configuration.
88

9-
* :doc:`framework </reference/configuration/framework>`
10-
* :doc:`doctrine </reference/configuration/doctrine>`
11-
* :doc:`security </reference/configuration/security>`
12-
* :doc:`twig </reference/configuration/twig>`
13-
* :doc:`monolog </reference/configuration/monolog>`
14-
* :doc:`web_profiler </reference/configuration/web_profiler>`
15-
* :doc:`debug </reference/configuration/debug>`
9+
* :doc:`framework </reference/configuration/framework>`
10+
* :doc:`doctrine </reference/configuration/doctrine>`
11+
* :doc:`security </reference/configuration/security>`
12+
* :doc:`twig </reference/configuration/twig>`
13+
* :doc:`monolog </reference/configuration/monolog>`
14+
* :doc:`web_profiler </reference/configuration/web_profiler>`
15+
* :doc:`debug </reference/configuration/debug>`
1616

1717
Forms and Validation
1818
--------------------

0 commit comments

Comments
 (0)