From 906fd9598e51c6e630710bbf4f3a270040908ed2 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 16 Apr 2024 09:57:37 +0000 Subject: * server/core.c (set_override): Catch errors returned by set_allow_opts() for a parsing fail in an Options= argument. Submitted by: Zhou Qingyang Github: closes #310 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1917017 13f79535-47bb-0310-9956-ffa450edef68 --- server/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'server') 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; } -- cgit v1.2.3