diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-04-27 22:15:57 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-04-27 22:15:57 +0200 |
| commit | 7c2115d95a05b5aeaf762c372b8d7ef54d81b7d3 (patch) | |
| tree | 106f065f03ff526c49e30d49637eb1baf617ffdf /phpBB | |
| parent | 734b89e75cdb02ae436b03d3247cfa820e03f42c (diff) | |
| parent | 78c022185577cd9ecdc40eee50480bb94a69f665 (diff) | |
| download | forums-7c2115d95a05b5aeaf762c372b8d7ef54d81b7d3.tar forums-7c2115d95a05b5aeaf762c372b8d7ef54d81b7d3.tar.gz forums-7c2115d95a05b5aeaf762c372b8d7ef54d81b7d3.tar.bz2 forums-7c2115d95a05b5aeaf762c372b8d7ef54d81b7d3.tar.xz forums-7c2115d95a05b5aeaf762c372b8d7ef54d81b7d3.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 3828fde1ce..76b974d0ce 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1820,7 +1820,7 @@ function redirect($url, $return = false, $disable_cd_check = false) } // Redirect via an HTML form for PITA webservers - if (@preg_match('#Microsoft|WebSTAR|Xitami#', getenv('SERVER_SOFTWARE'))) + if (@preg_match('#WebSTAR|Xitami#', getenv('SERVER_SOFTWARE'))) { header('Refresh: 0; URL=' . $url); |