From: Greg Stein <gstein@apache.org>
Date: Thu, 25 Jan 2001 21:38:10 +0000 (+0000)
Subject: clarify the comments about FollowSymLinks (and .htaccess)
X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85d62d0ee23ee31d7185c61beef47413d335f7ea;p=thirdparty%2Fapache%2Fhttpd.git

clarify the comments about FollowSymLinks (and .htaccess)


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

diff --git a/docs/conf/highperformance-std.conf b/docs/conf/highperformance-std.conf
index d3a5540435d..a97217b050d 100755
--- a/docs/conf/highperformance-std.conf
+++ b/docs/conf/highperformance-std.conf
@@ -44,10 +44,16 @@ ErrorLog logs/error_log
 # this if you need logging.
 #TransferLog logs/access_log
 
-# Disable symlink protection and htaccess files, they chew far too much.
 <Directory />
-    AllowOverride none
+    # The server can be made to avoid following symbolic links,
+    # to make security simpler. However, this takes extra CPU time,
+    # so we will just let it follow symlinks.
     Options FollowSymLinks
+
+    # Don't check for .htaccess files in each directory - they slow
+    # things down
+    AllowOverride None
+
     # If this was a real internet server you'd probably want to
     # uncomment these:
     #order deny,allow