You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ig...@apache.org on 2010/12/24 01:37:31 UTC
svn commit: r1052419 - in /httpd/httpd/trunk: CHANGES
docs/manual/mod/core.xml server/core.c
Author: igalic
Date: Fri Dec 24 00:37:30 2010
New Revision: 1052419
URL: http://svn.apache.org/viewvc?rev=1052419&view=rev
Log:
Changing the default Options from All to FollowSymlinks.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/docs/manual/mod/core.xml
httpd/httpd/trunk/server/core.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1052419&r1=1052418&r2=1052419&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Dec 24 00:37:30 2010
@@ -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]
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=1052419&r1=1052418&r2=1052419&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Fri Dec 24 00:37:30 2010
@@ -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>
Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1052419&r1=1052418&r2=1052419&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Fri Dec 24 00:37:30 2010
@@ -117,7 +117,7 @@ static void *create_core_dir_config(apr_
/* 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_parm
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
action = *(w++);
}
else if (first) {
- d->opts = OPT_NONE;
+ d->opts = OPT_NONE;
first = 0;
}