#2265 Installer falsely claims modrewrite fails (mamp) (merged from trunk, r50698)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.2.2@51063 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
aoneil 2008-03-13 22:57:39 +00:00 committed by Sam Minnee
parent e95a2df7dd
commit 58c11a2d60
2 changed files with 3 additions and 3 deletions

View File

@ -899,7 +899,7 @@ TEXT;
} }
// Check if mod_rewrite works properly // 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; echo $location;
@$testrewriting = file_get_contents($location); @$testrewriting = file_get_contents($location);

View File

@ -43,8 +43,8 @@ function performModRewriteTest() {
} }
// Check if mod_rewrite works properly // 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';
@$testrewriting = file_get_contents($location); $testrewriting = file_get_contents($location);
if($testrewriting == 'OK') { if($testrewriting == 'OK') {
return true; return true;