summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2024-04-16 11:57:37 +0200
committerJoe Orton <jorton@apache.org>2024-04-16 11:57:37 +0200
commit906fd9598e51c6e630710bbf4f3a270040908ed2 (patch)
treec1b234e1d48b135890339181dd0a789230cc3769
parentdocs: Use AP_DECLARE_MODULE in Developing modules and mod_so guides (diff)
downloadapache2-906fd9598e51c6e630710bbf4f3a270040908ed2.tar.xz
apache2-906fd9598e51c6e630710bbf4f3a270040908ed2.zip
* server/core.c (set_override): Catch errors returned by
set_allow_opts() for a parsing fail in an Options= argument. Submitted by: Zhou Qingyang <zhou1615 umn.edu> Github: closes #310 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1917017 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--server/core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/server/core.c b/server/core.c
index 5c065121be..d4d868d7d8 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1906,8 +1906,10 @@ static const char *set_override(cmd_parms *cmd, void *d_, const char *l)
}
else if (!ap_cstr_casecmp(k, "Options")) {
d->override |= OR_OPTIONS;
- if (v)
- set_allow_opts(cmd, &(d->override_opts), v);
+ if (v) {
+ if ((err = set_allow_opts(cmd, &(d->override_opts), v)) != NULL)
+ return err;
+ }
else
d->override_opts = OPT_ALL;
}