From da06ec2142bbb2397557c3503601561813e62dc7 Mon Sep 17 00:00:00 2001 From: ischommer Date: Fri, 7 Mar 2008 01:17:15 +0000 Subject: [PATCH] #2265 Installer falsely claims modrewrite fails (mamp) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@50691 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- install.php | 2 +- rewritetest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install.php b/install.php index ad64d20..4fce17b 100644 --- a/install.php +++ b/install.php @@ -899,7 +899,7 @@ TEXT; } // Check if mod_rewrite works properly - $location = 'http://' . (isset($_SERVER['PHP_AUTH_USER']) ? "$_SERVER[PHP_AUTH_USER]:$_SERVER[PHP_AUTH_PW]@" : '') . $_SERVER['HTTP_HOST'] . $baseURL . '/InstallerTest/testRewrite'; + $location = 'http://' . (isset($_SERVER['PHP_AUTH_USER']) ? "$_SERVER[PHP_AUTH_USER]:$_SERVER[PHP_AUTH_PW]@" : '') . $_SERVER['HTTP_HOST'] . $baseURL . '/InstallerTest/testrewrite'; echo $location; @$testrewriting = file_get_contents($location); diff --git a/rewritetest.php b/rewritetest.php index 57e8750..2791863 100644 --- a/rewritetest.php +++ b/rewritetest.php @@ -43,8 +43,8 @@ function performModRewriteTest() { } // Check if mod_rewrite works properly - $location = 'http://' . (isset($_SERVER['PHP_AUTH_USER']) ? "$_SERVER[PHP_AUTH_USER]:$_SERVER[PHP_AUTH_PW]@" : '') . $_SERVER['HTTP_HOST'] . $baseURL . '/InstallerTest/testRewrite'; - @$testrewriting = file_get_contents($location); + $location = 'http://' . (isset($_SERVER['PHP_AUTH_USER']) ? "$_SERVER[PHP_AUTH_USER]:$_SERVER[PHP_AUTH_PW]@" : '') . $_SERVER['HTTP_HOST'] . $baseURL . '/InstallerTest/testrewrite'; + $testrewriting = file_get_contents($location); if($testrewriting == 'OK') { return true;