Skip to content

Commit ea387cd

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: Minor fix Add note on Apache issue with FallbackResource [#12336] fix a minor typo
2 parents d216423 + 142bdaf commit ea387cd

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ following configuration file:
3939
resource: '../src/Controller/'
4040
type: annotation
4141
42-
This configuration tells Symfony to looks for routes defined as annotations in
42+
This configuration tells Symfony to look for routes defined as annotations in
4343
any PHP class stored in the ``src/Controller/`` directory.
4444

4545
Suppose you want to define a route for the ``/blog`` URL in your application. To

setup/web_server_configuration.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,11 @@ and increase web server performance:
124124
#SetEnv DATABASE_URL "mysql://db_user:db_pass@host:3306/db_name"
125125
</VirtualHost>
126126
127+
.. caution::
128+
129+
Use ``FallbackResource`` on Apache 2.4.25 or higher, due to a bug which was
130+
fixed on that release causing the root ``/`` to hang.
131+
127132
.. tip::
128133

129134
If you are using **php-cgi**, Apache does not pass HTTP basic username and

0 commit comments

Comments
 (0)