From 322be54599df09404bb6a099d4e1519068d73a94 Mon Sep 17 00:00:00 2001 From: sminnee Date: Wed, 13 Oct 2010 04:23:34 +0000 Subject: [PATCH] MINOR Check for IIS/7 specifically, as IIS 6 has a completely different way of installing (from r100634) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112192 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.php b/install.php index 16ceac1..b8287e4 100644 --- a/install.php +++ b/install.php @@ -277,7 +277,7 @@ class InstallRequirements { */ function isIIS() { if(isset($_SERVER['SERVER_SOFTWARE'])) { - if(strpos($_SERVER['SERVER_SOFTWARE'], 'IIS') !== false) { + if(strpos($_SERVER['SERVER_SOFTWARE'], 'IIS/7') !== false) { return true; } } @@ -300,7 +300,7 @@ class InstallRequirements { $webserver = strip_tags(trim(@$_SERVER['SERVER_SIGNATURE'])); if(!$webserver) { if(isset($_SERVER['SERVER_SOFTWARE'])) { - if(strpos($_SERVER['SERVER_SOFTWARE'], 'IIS') !== false || + if(strpos($_SERVER['SERVER_SOFTWARE'], 'IIS/7') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) { $webserver = $_SERVER['SERVER_SOFTWARE']; }