summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2014-07-25 17:04:48 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2014-07-25 17:04:48 +0000
commit02357145ab6dbb9992425a194d5c025fe72a5756 (patch)
tree0e22c9a9dc937b204440db3ddce940d7bdab7119
parent78dfb85020faa1d4d4fda5592c472c6e3b654cb3 (diff)
Add a single line to fix the address matching of multiple server blocks with
non-virtual hosts. I had this line in a previous diff.
-rw-r--r--usr.sbin/httpd/parse.y3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y
index 334ea48da67..1105e55c2a2 100644
--- a/usr.sbin/httpd/parse.y
+++ b/usr.sbin/httpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.6 2014/07/25 16:23:19 reyk Exp $ */
+/* $OpenBSD: parse.y,v 1.7 2014/07/25 17:04:47 reyk Exp $ */
/*
* Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -264,6 +264,7 @@ serveroptsl : LISTEN ON STRING port {
memcpy(&srv->srv_conf.ss, &h->ss,
sizeof(s->srv_conf.ss));
s->srv_conf.port = h->port.val[0];
+ s->srv_conf.prefixlen = h->prefixlen;
host_free(&al);
}
| ROOT STRING {