Use IfModule in .htaccess files for Apache 2.4.

robgjansen · Oct 30, 2013 · a3dd461 · a3dd461
1 parent e2b8bba
commit a3dd461
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 1 deletion.
diff --git a/Code/.htaccess b/Code/.htaccess
@@ -1,2 +1,7 @@
+<IfModule mod_authz_core.c>
+Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
 Order deny,allow
 Deny from all
+</IfModule>
diff --git a/README.md b/README.md
@@ -94,6 +94,15 @@ directory. For example, this section of httpd.conf makes the
         </Directory>
         Alias /testconf /home/kohler/hotcrp
 
+    Apache 2.4 or later requires this instead.
+
+        <Directory "/home/kohler/hotcrp">
+            Options Indexes Includes FollowSymLinks
+            AllowOverride all
+            Require all granted
+        </Directory>
+        Alias /testconf /home/kohler/hotcrp
+
     Note that the first argument to Alias should NOT end in a slash. The
 "AllowOverride all" directive is required.
 

diff --git a/conf/.htaccess b/conf/.htaccess
@@ -1,2 +1,7 @@
+<IfModule mod_authz_core.c>
+Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
 Order deny,allow
 Deny from all
+</IfModule>
diff --git a/lib/.htaccess b/lib/.htaccess
@@ -1,2 +1,7 @@
+<IfModule mod_authz_core.c>
+Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
 Order deny,allow
 Deny from all
+</IfModule>
diff --git a/lib/documenthelper.php b/lib/documenthelper.php
@@ -251,7 +251,7 @@ private static function _store_filestore($fsinfo, $doc) {
 	// filestore directory
 	$htaccess = "$fdir/.htaccess";
 	if (!is_file($htaccess)
-	    && file_put_contents($htaccess, "Order deny,allow\nDeny from all\nphp_flag magic_quotes_gpc off\n") === false) {
+	    && file_put_contents($htaccess, "<IfModule mod_authz_core.c>\nRequire all denied\n</IfModule>\n<IfModule !mod_authz_core.c>\nOrder deny,allow\nDeny from all\n</IfModule>\n") === false) {
 	    @unlink("$fdir/.htaccess");
 	    return false;
 	}

diff --git a/src/.htaccess b/src/.htaccess
@@ -1,2 +1,7 @@
+<IfModule mod_authz_core.c>
+Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
 Order deny,allow
 Deny from all
+</IfModule>