From 21e0a16abbfe09363f92adc64cb311e570154a75 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Igor=20Gali=C4=87?= <igalic@apache.org>
Date: Fri, 24 Dec 2010 00:37:30 +0000
Subject: [PATCH] Changing the default Options from All to FollowSymlinks.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1052419 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES                  |  3 +++
 docs/manual/mod/core.xml | 12 ++++++------
 server/core.c            |  6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index c2c43cc281..680a7afe94 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.3.11
 
+  *) core: In the absence of any Options directives, the default is now
+     "FollowSymlinks" instead of "All".  [Igor Galić]
+
   *) rotatelogs: Add -e option to write logs through to stdout for optional
      further processing. [Graham Leggett]
 
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 19597a8d72..f3328d8009 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2981,11 +2981,12 @@ documentation</a></seealso>
 directory</description>
 <syntax>Options
     [+|-]<var>option</var> [[+|-]<var>option</var>] ...</syntax>
-<default>Options All</default>
+<default>Options FollowSymlinks</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context>
 </contextlist>
 <override>Options</override>
+<compatibility>The default was changed from All to FollowSymlinks in 2.3.11</compatibility>
 
 <usage>
     <p>The <directive>Options</directive> directive controls which
@@ -2998,8 +2999,7 @@ directory</description>
     <dl>
       <dt><code>All</code></dt>
 
-      <dd>All options except for <code>MultiViews</code>. This is the default
-      setting.</dd>
+      <dd>All options except for <code>MultiViews</code>.</dd>
 
       <dt><code>ExecCGI</code></dt>
 
@@ -3010,8 +3010,8 @@ directory</description>
       <dt><code>FollowSymLinks</code></dt>
 
       <dd>
-
-      The server will follow symbolic links in this directory.
+      The server will follow symbolic links in this directory. This is
+      the default setting.
       <note>
       <p>Even though the server follows the symlink it does <em>not</em>
       change the pathname used to match against <directive type="section"
@@ -3140,7 +3140,7 @@ directory</description>
     </note>
 
     <p>The default in the absence of any other settings is
-    <code>All</code>.</p>
+    <code>FollowSymlinks</code>.</p>
 </usage>
 </directivesynopsis>
 
diff --git a/server/core.c b/server/core.c
index a67a0633d3..dc1f1c4201 100644
--- a/server/core.c
+++ b/server/core.c
@@ -117,7 +117,7 @@ static void *create_core_dir_config(apr_pool_t *a, char *dir)
 
     /* conf->r and conf->d[_*] are initialized by dirsection() or left NULL */
 
-    conf->opts = dir ? OPT_UNSET : OPT_UNSET|OPT_ALL;
+    conf->opts = dir ? OPT_UNSET : OPT_UNSET|OPT_SYM_LINKS;
     conf->opts_add = conf->opts_remove = OPT_NONE;
     conf->override = OR_UNSET|OR_NONE;
     conf->override_opts = OPT_UNSET | OPT_ALL | OPT_SYM_OWNER | OPT_MULTI;
@@ -1377,7 +1377,7 @@ static const char *set_override(cmd_parms *cmd, void *d_, const char *l)
             if (v)
                 set_allow_opts(cmd, &(d->override_opts), v);
             else
-                d->override_opts = OPT_ALL;
+                d->override_opts = OPT_SYM_LINKS;
         }
         else if (!strcasecmp(w, "FileInfo")) {
             d->override |= OR_FILEINFO;
@@ -1419,7 +1419,7 @@ static const char *set_options(cmd_parms *cmd, void *d_, const char *l)
             action = *(w++);
         }
         else if (first) {
-              d->opts = OPT_NONE;
+            d->opts = OPT_NONE;
             first = 0;
         }
 
-- 
2.40.0