Skip to content

Commit 238099e

Browse files
committed
Merge branch '2.4' into 2.5
* 2.4: [HttpKernel] added an analyze of environment parameters for built-in server. change command to which available under most unix systems add way to test command under windows fix shell command injection [Form] allowed CallbackTransformer to use callable [Process] Added process synchronization to the incremental output tests
2 parents b8b9585 + 9bffa70 commit 238099e

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

Resources/config/router_dev.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
return false;
2626
}
2727

28+
$_SERVER = array_merge($_SERVER, $_ENV);
2829
$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.'app_dev.php';
2930

3031
require 'app_dev.php';

Resources/config/router_prod.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
return false;
2626
}
2727

28+
$_SERVER = array_merge($_SERVER, $_ENV);
2829
$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.'app.php';
2930

3031
require 'app.php';

0 commit comments

Comments
 (0)