Permalink
Browse files

MINOR Check for IIS/7 specifically, as IIS 6 has a completely differe…

…nt way of installing (from r100634)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112192 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent 34fa1f0 commit 322be54599df09404bb6a099d4e1519068d73a94 sminnee committed Oct 13, 2010
Showing with 2 additions and 2 deletions.
  1. +2 −2 install.php
View
@@ -277,7 +277,7 @@ function checkAdminConfig($adminConfig) {
*/
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 @@ function findWebserver() {
$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'];
}

0 comments on commit 322be54

Please sign in to comment.