@@ -5,4 +5,8 @@ php_value post_max_size 512M | |||
php_value memory_limit 128M | |||
SetEnv htaccessWorking true | |||
</IfModule> | |||
<IfModule !mod_php5.c> | |||
RewriteEngine on | |||
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last] | |||
</IfModule> | |||
Options -Indexes |
@@ -81,6 +81,14 @@ class OC{ | |||
date_default_timezone_set('Europe/Berlin'); | |||
ini_set('arg_separator.output','&'); | |||
//set http auth headers for apache+php-cgi work around | |||
if (preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) | |||
{ | |||
list($name, $password) = explode(':', base64_decode($matches[1])); | |||
$_SERVER['PHP_AUTH_USER'] = strip_tags($name); | |||
$_SERVER['PHP_AUTH_PW'] = strip_tags($password); | |||
} | |||
// calculate the documentroot | |||
OC::$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']); | |||
OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13)); |
@@ -273,6 +273,10 @@ class OC_Setup { | |||
$content.= "php_value post_max_size 512M\n"; | |||
$content.= "SetEnv htaccessWorking true\n"; | |||
$content.= "</IfModule>\n"; | |||
$content.= "<IfModule !mod_php5.c>\n"; | |||
$content.= "RewriteEngine on\n"; | |||
$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]\n"; | |||
$content.= "</IfModule>\n"; | |||
$content.= "Options -Indexes\n"; | |||
@file_put_contents(OC::$SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it | |||