From 2fa78ba32833e2a9fe28fa974615151dbb145cf9 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 18 Aug 2014 00:14:58 -0700
Subject: [PATCH] make_project: don't generate Apache 2.4 directives because
 they break 2.2

... but put in comments saying what changes are needed.
---
 tools/make_project | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/make_project b/tools/make_project
index 3d7e0b8573..4156e33d74 100755
--- a/tools/make_project
+++ b/tools/make_project
@@ -324,15 +324,14 @@ print >>open(httpd_conf_template_filename,'w'), '''
 
     # Note: projects/*/keys/ should NOT be readable!
 
-    # in the following, "Order" and "Allow" are for Apache 2.2;
-    # "Require" is for Apache 2.4
+    # in the following, the "Order" and "Allow" lines are for Apache 2.2;
+    # replace them with "Require all granted" for Apache 2.4
 
     <Directory "%(proot)s/html">
         Options Indexes FollowSymlinks MultiViews
         AllowOverride AuthConfig
         Order allow,deny
         Allow from all
-        Require all granted
     </Directory>
 
     <Directory "%(proot)s/cgi-bin">
@@ -340,7 +339,6 @@ print >>open(httpd_conf_template_filename,'w'), '''
         AllowOverride AuthConfig
         Order allow,deny
         Allow from all
-        Require all granted
     </Directory>
 ''' %locals()