summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2002-10-07 07:43:14 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2002-10-07 07:43:14 +0000
commitc6c7943df02dc913062fab273f0399a6e7fe24bf (patch)
tree6fd8d92f978df407edf91374371982bb29c9e095 /usr.sbin
parent378671f9f69d0e1b7b2d9c443584f084bbae7804 (diff)
make restarts work again with missing srm.conf (sigh)
pointed out by nicolas at untz dot net, thanks!
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/httpd/src/main/http_config.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/httpd/src/main/http_config.c b/usr.sbin/httpd/src/main/http_config.c
index effe5397e8b..2e58f432116 100644
--- a/usr.sbin/httpd/src/main/http_config.c
+++ b/usr.sbin/httpd/src/main/http_config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: http_config.c,v 1.10 2002/07/15 09:40:49 henning Exp $ */
+/* $OpenBSD: http_config.c,v 1.11 2002/10/07 07:43:13 henning Exp $ */
/* ====================================================================
* The Apache Software License, Version 1.1
@@ -1266,15 +1266,15 @@ CORE_EXPORT(void) ap_process_resource_config(server_rec *s, char *fname, pool *p
fname = ap_server_root_relative(p, fname);
- /* if we are already chrooted here, it's a restart. strip chroot then. */
- ap_server_strip_chroot(fname, 0);
-
if (!(strcmp(fname, ap_server_root_relative(p, RESOURCE_CONFIG_FILE))) ||
!(strcmp(fname, ap_server_root_relative(p, ACCESS_CONFIG_FILE)))) {
if (stat(fname, &finfo) == -1)
return;
}
+ /* if we are already chrooted here, it's a restart. strip chroot then. */
+ ap_server_strip_chroot(fname, 0);
+
/* don't require conf/httpd.conf if we have a -C or -c switch */
if((ap_server_pre_read_config->nelts || ap_server_post_read_config->nelts) &&
!(strcmp(fname, ap_server_root_relative(p, SERVER_CONFIG_FILE)))) {