From: Rich Bowen <rbowen@apache.org>
Date: Thu, 10 Mar 2011 17:18:40 +0000 (+0000)
Subject: igalic reminded me that AllowOverride now defaults to none, and Options
X-Git-Tag: 2.3.12~258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0eb6f65b3bb5068a137ccf83b4e248791b13d7a;p=apache

igalic reminded me that AllowOverride now defaults to none, and Options
now defaults to FollowSymlinks, so simplify this entire section and thus
reduce the chance that people will tinker with it. Remove scary warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080290 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
index ceb836f680..e7628a660e 100644
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
@@ -114,19 +114,11 @@ ServerAdmin you@example.com
 DocumentRoot "@exp_htdocsdir@"
 
 #
-# Each directory to which Apache has access can be configured with respect
-# to which services and features are allowed and/or disabled in that
-# directory (and its subdirectories). 
-#
-# First, we configure the "default" to be a very restrictive set of 
-# features.  
-#
-# YOU SHOULD NOT RELAX THE CONFIGURATION FOR <Directory />. YOU ARE
-# PROBABLY LOOKING FOR THE <Directory> BLOCK IMMEDIATELY BELOW THIS ONE.
+# Deny access to the entirety of your server's filesystem. You must
+# explicitly permit access to web content directories in other 
+# <Directory> blocks below.
 #
 <Directory />
-    Options FollowSymLinks
-    AllowOverride None
     Require all denied
 </Directory>