Merge pull request #13730 from owncloud/fix-htaccess

Reference module with `.c`
This commit is contained in:
Morris Jobke 2015-01-28 15:07:49 +01:00
commit 723f2a1cba
3 changed files with 6 additions and 6 deletions

View File

@ -13,7 +13,7 @@ php_value post_max_size 513M
php_value memory_limit 512M
php_value mbstring.func_overload 0
php_value always_populate_raw_post_data -1
<IfModule env_module>
<IfModule mod_env.c>
SetEnv htaccessWorking true
</IfModule>
</IfModule>
@ -34,7 +34,7 @@ RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
AddType image/svg+xml svg svgz
AddEncoding gzip svgz
</IfModule>
<IfModule dir_module>
<IfModule mod_dir.c>
DirectoryIndex index.php index.html
</IfModule>
AddDefaultCharset utf-8

View File

@ -1,10 +1,10 @@
# line below if for Apache 2.4
<ifModule mod_authz_core>
<ifModule mod_authz_core.c>
Require all denied
</ifModule>
# line below if for Apache 2.2
<ifModule !mod_authz_core>
<ifModule !mod_authz_core.c>
deny from all
</ifModule>

View File

@ -287,11 +287,11 @@ class OC_Setup {
$now = date('Y-m-d H:i:s');
$content = "# Generated by ownCloud on $now\n";
$content.= "# line below if for Apache 2.4\n";
$content.= "<ifModule mod_authz_core>\n";
$content.= "<ifModule mod_authz_core.c>\n";
$content.= "Require all denied\n";
$content.= "</ifModule>\n\n";
$content.= "# line below if for Apache 2.2\n";
$content.= "<ifModule !mod_authz_core>\n";
$content.= "<ifModule !mod_authz_core.c>\n";
$content.= "deny from all\n";
$content.= "</ifModule>\n\n";
$content.= "# section for Apache 2.2 and 2.4\n";