mirror of
https://github.com/silverstripe/silverstripe-installer
synced 2024-10-22 17:05:33 +02:00
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
This commit is contained in:
parent
34fa1f06bf
commit
322be54599
@ -277,7 +277,7 @@ class InstallRequirements {
|
|||||||
*/
|
*/
|
||||||
function isIIS() {
|
function isIIS() {
|
||||||
if(isset($_SERVER['SERVER_SOFTWARE'])) {
|
if(isset($_SERVER['SERVER_SOFTWARE'])) {
|
||||||
if(strpos($_SERVER['SERVER_SOFTWARE'], 'IIS') !== false) {
|
if(strpos($_SERVER['SERVER_SOFTWARE'], 'IIS/7') !== false) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -300,7 +300,7 @@ class InstallRequirements {
|
|||||||
$webserver = strip_tags(trim(@$_SERVER['SERVER_SIGNATURE']));
|
$webserver = strip_tags(trim(@$_SERVER['SERVER_SIGNATURE']));
|
||||||
if(!$webserver) {
|
if(!$webserver) {
|
||||||
if(isset($_SERVER['SERVER_SOFTWARE'])) {
|
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) {
|
strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
|
||||||
$webserver = $_SERVER['SERVER_SOFTWARE'];
|
$webserver = $_SERVER['SERVER_SOFTWARE'];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user