summaryrefslogtreecommitdiffstats
path: root/usr.sbin/httpd
diff options
context:
space:
mode:
authorflorian <florian@openbsd.org>2019-02-08 11:46:07 +0000
committerflorian <florian@openbsd.org>2019-02-08 11:46:07 +0000
commitdf08f2594f8af4cce37132dd95db0863ea513b69 (patch)
tree08ab887e868dc8b375cd12ebdf37d2964d0c6c3c /usr.sbin/httpd
parentupdate unwind's copy of libunbound to match the new 1.9.0 update in (diff)
downloadwireguard-openbsd-df08f2594f8af4cce37132dd95db0863ea513b69.tar.xz
wireguard-openbsd-df08f2594f8af4cce37132dd95db0863ea513b69.zip
Improve fastcgi socket documentation and mention that TCP is supported in
addition to UNIX domain sockets. Prompted by a mail from Daniel Gracia ( paladdin AT gmail ) pointing out that we are not documenting TCP support at all, thanks! Prodding by and with jmc@
Diffstat (limited to 'usr.sbin/httpd')
-rw-r--r--usr.sbin/httpd/httpd.conf.515
1 files changed, 12 insertions, 3 deletions
diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5
index f47bc479218..d75c47269e0 100644
--- a/usr.sbin/httpd/httpd.conf.5
+++ b/usr.sbin/httpd/httpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: httpd.conf.5,v 1.101 2018/06/20 16:43:05 reyk Exp $
+.\" $OpenBSD: httpd.conf.5,v 1.102 2019/02/08 11:46:07 florian Exp $
.\"
.\" Copyright (c) 2014, 2015 Reyk Floeter <reyk@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: June 20 2018 $
+.Dd $Mdocdate: February 8 2019 $
.Dt HTTPD.CONF 5
.Os
.Sh NAME
@@ -276,7 +276,12 @@ will neither display nor generate a directory index.
.El
.It Oo Ic no Oc Ic fastcgi Op Ic socket Ar socket
Enable FastCGI instead of serving files.
-The
+.Nm httpd
+passes HTTP requests to a FastCGI handler listening on the socket
+.Ar socket .
+The socket can either be a UNIX domain socket or a TCP socket listening
+on localhost (127.0.0.1).
+If the FastCGI handler is listening on a UNIX domain socket,
.Ar socket
is a local path name within the
.Xr chroot 2
@@ -284,6 +289,10 @@ root directory of
.Xr httpd 8
and defaults to
.Pa /run/slowcgi.sock .
+Alternatively if
+the FastCGI handler is listening on a TCP socket,
+.Ar socket
+starts with a colon followed by the TCP port number.
.Pp
The FastCGI handler will be given the following variables:
.Pp