tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 17:05:33 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Sometimes SERVER_SIGNATURE isn't populated in PHP, so fall back to using SERVER_SOFTWARE to detect the webserver during SS install (from r93113)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112084 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
sminnee 2010-10-13 02:20:13 +00:00
parent 3077816c25
commit 62d6260fab
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install.php
View File

@ -230,9 +230,11 @@ class InstallRequirements {
if(!isset($_SERVER['argv']) || !$_SERVER['argv']) {
$webserver = strip_tags(trim($_SERVER['SERVER_SIGNATURE']));
if(!$webserver) {
if(isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'IIS') !== false) {
$pieces = explode('-', $_SERVER['SERVER_SOFTWARE']);
if(isset($pieces[1])) $webserver = $pieces[1];
if(isset($_SERVER['SERVER_SOFTWARE'])) {
if(strpos($_SERVER['SERVER_SOFTWARE'], 'IIS') !== false ||
strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
$webserver = $_SERVER['SERVER_SOFTWARE'];
}
} else {
$webserver = "I can't tell what webserver you are running";
}