summaryrefslogtreecommitdiffstats
path: root/server/core.c
diff options
context:
space:
mode:
authorIgor Galić <igalic@apache.org>2010-12-24 01:37:30 +0100
committerIgor Galić <igalic@apache.org>2010-12-24 01:37:30 +0100
commit21e0a16abbfe09363f92adc64cb311e570154a75 (patch)
tree832755df53d378afacec1b3c48edfd234b7ec2d1 /server/core.c
parent* The concept of the cleaned flag is flawed: Once we returned the connection (diff)
downloadapache2-21e0a16abbfe09363f92adc64cb311e570154a75.tar.xz
apache2-21e0a16abbfe09363f92adc64cb311e570154a75.zip
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
Diffstat (limited to 'server/core.c')
-rw-r--r--server/core.c6
1 files changed, 3 insertions, 3 deletions
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;
}