summaryrefslogtreecommitdiff
path: root/usr.sbin/httpd/config.c
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2014-07-31 09:34:58 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2014-07-31 09:34:58 +0000
commit8c1b33a78cf3a28b10a20765091caa036f177778 (patch)
tree80c1ce02a4a131622d9a5d65a11bba3d41574773 /usr.sbin/httpd/config.c
parentbc45001cf4e743164a676f113a28ae6a97825012 (diff)
Add a configuration variable "fastcgi" to enable it per server or location.
Diffstat (limited to 'usr.sbin/httpd/config.c')
-rw-r--r--usr.sbin/httpd/config.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/httpd/config.c b/usr.sbin/httpd/config.c
index 44cd419565f..cc8060f313c 100644
--- a/usr.sbin/httpd/config.c
+++ b/usr.sbin/httpd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.7 2014/07/30 13:49:48 reyk Exp $ */
+/* $OpenBSD: config.c,v 1.8 2014/07/31 09:34:57 reyk Exp $ */
/*
* Copyright (c) 2011 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -245,6 +245,10 @@ config_getserver_config(struct httpd *env, struct server *srv,
sizeof(srv_conf->docroot));
}
+ f = SRVFLAG_FCGI|SRVFLAG_NO_FCGI;
+ if ((srv_conf->flags & f) == 0)
+ srv_conf->flags |= srv->srv_conf.flags & f;
+
DPRINTF("%s: %s %d received location \"%s\", parent \"%s\"",
__func__, ps->ps_title[privsep_process], ps->ps_instance,
srv_conf->location, srv->srv_conf.name);