Commit05888ce

Amrouche Hamza

committed

[WebServerBundle] fix a bug where require would not require the good file because of env

1 parent77104a1 commit05888ceCopy full SHA for 05888ce

File tree

-0

lines changed

src/Symfony/Bundle/WebServerBundle
- Resources
  - router.php
- WebServerConfig.php

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,10 @@`
`32`	`32`
`33`	`33`	`$script =getenv('APP_FRONT_CONTROLLER') ?:'index.php';`
`34`	`34`
	`35`	`+if (isset($_ENV['APP_FRONT_CONTROLLER']) &&false ===getenv('APP_FRONT_CONTROLLER')) {`
	`36`	`+$script =$_ENV['APP_FRONT_CONTROLLER'];`
	`37`	`+}`
	`38`	`+`
`35`	`39`	`$_SERVER =array_merge($_SERVER,$_ENV);`
`36`	`40`	`$_SERVER['SCRIPT_FILENAME'] =$_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.$script;`
`37`	`41`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public function __construct($documentRoot, $env, $address = null, $router = null`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`putenv('APP_FRONT_CONTROLLER='.$file);`
	`36`	`+$_ENV['APP_FRONT_CONTROLLER'] =$file;`
`36`	`37`
`37`	`38`	`$this->documentRoot =$documentRoot;`
`38`	`39`	`$this->env =$env;`

Comments

(0)