diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-01-27 22:12:32 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-01-28 22:07:16 +0100 |
| commit | 74950559074d738733ac1258b07912f9ca14203a (patch) | |
| tree | 194ebc8fbe9501b68569ae4fc561e700ada2cddd /phpBB/includes | |
| parent | 5ce89ae82f7be38ef539872dc1fd360fb45c906a (diff) | |
| download | forums-74950559074d738733ac1258b07912f9ca14203a.tar forums-74950559074d738733ac1258b07912f9ca14203a.tar.gz forums-74950559074d738733ac1258b07912f9ca14203a.tar.bz2 forums-74950559074d738733ac1258b07912f9ca14203a.tar.xz forums-74950559074d738733ac1258b07912f9ca14203a.zip | |
[ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
The ORIG_PATH_INFO on IIS also contains the script name. Only use that
for killing the script after removing the script name from ORIG_PATH_INFO.
PHPBB3-13549
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/startup.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php index 92639fc5bd..9bbbf4fd4c 100644 --- a/phpBB/includes/startup.php +++ b/phpBB/includes/startup.php @@ -105,7 +105,7 @@ function deregister_globals() function phpbb_has_trailing_path($phpEx) { // Check if path_info is being used - if (!empty($_SERVER['PATH_INFO']) || !empty($_SERVER['ORIG_PATH_INFO'])) + if (!empty($_SERVER['PATH_INFO']) || (!empty($_SERVER['ORIG_PATH_INFO']) && $_SERVER['SCRIPT_NAME'] != $_SERVER['ORIG_PATH_INFO'])) { return true; } |