tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-05 07:38:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2672 from tiaitsch85/tiaitsch85-patch-1

Browse Source
This commit is contained in:
Sean Harvey 2013-11-18 14:37:09 +13:00
commit b48b08bb8d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dev/install/install.php5
View File

@ -362,15 +362,14 @@ class InstallRequirements {
}
/**
* Check if the web server is IIS.
* Check if the web server is IIS and version greater than the given version.
* @return boolean
*/
function isIIS($version = 7) {
if(strpos($this->findWebserver(), 'IIS/' . $version) !== false) {
return true;
} else {
function isIIS($fromVersion = 7) {
if(strpos($this->findWebserver(), 'IIS/') === false) {
return false;
}
return substr(strstr($this->findWebserver(), '/'), -3, 1) >= $fromVersion;
}
function isApache() {
@ -400,7 +399,7 @@ class InstallRequirements {
function check() {
$this->errors = null;
$isApache = $this->isApache();
$isIIS = $this->isIIS(7);
$isIIS = $this->isIIS();
$webserver = $this->findWebserver();
$this->requirePHPVersion('5.3.4', '5.3.2', array(