From d575279e8a762074c54758ab2e25c384ce2f1a92 Mon Sep 17 00:00:00 2001 From: reyk Date: Fri, 25 Jul 2014 17:04:47 +0000 Subject: [PATCH] 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. --- usr.sbin/httpd/parse.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 @@ -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 { -- 2.20.1