From ffd4b89905b4def449afeb55db0759a710811241 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 5 Sep 2013 06:03:04 -0700
Subject: [PATCH] make_project: add HTTP config file items for Apache 2.4

---
 doc/index.php      | 2 +-
 tools/make_project | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/index.php b/doc/index.php
index 3a0e000bdd..4d389c6b41 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -91,7 +91,7 @@ function show_participate() {
         <tr><td>
         <p>
         ".sprintf(
-            tra(" Use the idle time on your computer (Windows, Mac, or Linux) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:  %sChoose%s projects  %sDownload%s and run BOINC software  %sEnter%s an email address and password. "),
+            tra(" Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:  %sChoose%s projects  %sDownload%s and run BOINC software  %sEnter%s an email address and password. "),
             "<ol> <li> <a href=projects.php><b>",
             "</b></a>",
             "<li> <a href=download.php><b>",
diff --git a/tools/make_project b/tools/make_project
index 99449ed2c4..5b3b54c5bf 100755
--- a/tools/make_project
+++ b/tools/make_project
@@ -321,6 +321,7 @@ print >>open(httpd_conf_template_filename,'w'), '''
     <Directory "%(proot)s/html">
         Options Indexes FollowSymlinks MultiViews
         AllowOverride AuthConfig
+        Require all granted
         Order allow,deny
         Allow from all
     </Directory>
@@ -328,6 +329,7 @@ print >>open(httpd_conf_template_filename,'w'), '''
     <Directory "%(proot)s/cgi-bin">
         Options ExecCGI
         AllowOverride AuthConfig
+        Require all granted
         Order allow,deny
         Allow from all
     </Directory>