diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-01-28 15:07:49 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-01-28 15:07:49 +0100 |
| commit | 723f2a1cba27345e3cba2c43887a974813402299 (patch) | |
| tree | c054ea334ee0b3f511732c95fb759e7a4673d4be | |
| parent | 55142186deb9e163ce3519453ebfe93f6a446666 (diff) | |
| parent | 20199dd168faaff624434ba9d5b24d77788d6fa1 (diff) | |
| download | nextcloud-server-723f2a1cba27345e3cba2c43887a974813402299.tar.gz nextcloud-server-723f2a1cba27345e3cba2c43887a974813402299.zip | |
Merge pull request #13730 from owncloud/fix-htaccess
Reference module with `.c`
| -rw-r--r-- | .htaccess | 4 | ||||
| -rw-r--r-- | config/.htaccess | 4 | ||||
| -rw-r--r-- | lib/private/setup.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.htaccess b/.htaccess index 962e969d59c..78e6255c878 100644 --- a/.htaccess +++ b/.htaccess @@ -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 diff --git a/config/.htaccess b/config/.htaccess index 2421e9a1631..c7a7b79feac 100644 --- a/config/.htaccess +++ b/config/.htaccess @@ -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> diff --git a/lib/private/setup.php b/lib/private/setup.php index a350838763f..e3a29b6469d 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -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"; |