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 Fixed InstallerRequirements::isApache() which didn't work if $_SERVER['SERVER_SIGNATURE'] is available for Apache

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101733 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
sharvey 2010-03-26 01:54:18 +00:00 committed by Sam Minnee
parent f8b806f7df
commit 8efa9b3e41
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
install.php
View File

@ -277,15 +277,16 @@ class InstallRequirements {
} }
function isApache() { function isApache() {
$webserver = strip_tags(trim(@$_SERVER['SERVER_SIGNATURE'])); $signature = isset($_SERVER['SERVER_SIGNATURE'])
if(!$webserver) { ? $_SERVER['SERVER_SIGNATURE']
if(isset($_SERVER['SERVER_SOFTWARE'])) { : @$_SERVER['SERVER_SOFTWARE'];
if(strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
return true; $signature = strip_tags(trim($signature));
} if($signature && strpos($signature, 'Apache') !== false) {
} return true;
} else {
return false;
} }
return false;
} }
function findWebserver() { function findWebserver() {