From 1464756f1275128f9c68a9ddfe560ae952655928 Mon Sep 17 00:00:00 2001
From: Reyk Floeter <reyk@esdenera.com>
Date: Mon, 19 Jan 2015 20:49:54 +0100
Subject: sync with -current

---
 config.c      | 2 +-
 httpd.c       | 2 +-
 httpd.conf.5  | 4 ++--
 httpd.h       | 2 +-
 parse.y       | 2 +-
 server.c      | 2 +-
 server_fcgi.c | 2 +-
 server_http.c | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config.c b/config.c
index 5884c7b..07d8e32 100644
--- a/config.c
+++ b/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.29 2015/01/13 09:21:15 reyk Exp $	*/
+/*	$OpenBSD: config.c,v 1.30 2015/01/19 19:37:50 reyk Exp $	*/
 
 /*
  * Copyright (c) 2011 - 2015 Reyk Floeter <reyk@openbsd.org>
diff --git a/httpd.c b/httpd.c
index 79acce9..f229cc5 100644
--- a/httpd.c
+++ b/httpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: httpd.c,v 1.29 2015/01/16 06:40:17 deraadt Exp $	*/
+/*	$OpenBSD: httpd.c,v 1.30 2015/01/19 19:37:50 reyk Exp $	*/
 
 /*
  * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
diff --git a/httpd.conf.5 b/httpd.conf.5
index 1d66c46..f40273c 100644
--- a/httpd.conf.5
+++ b/httpd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: httpd.conf.5,v 1.46 2015/01/18 18:39:46 florian Exp $
+.\"	$OpenBSD: httpd.conf.5,v 1.47 2015/01/19 19:37:50 reyk 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: January 18 2015 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt HTTPD.CONF 5
 .Os
 .Sh NAME
diff --git a/httpd.h b/httpd.h
index 8438d51..e0473cb 100644
--- a/httpd.h
+++ b/httpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: httpd.h,v 1.69 2015/01/18 14:01:17 florian Exp $	*/
+/*	$OpenBSD: httpd.h,v 1.70 2015/01/19 19:37:50 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>
diff --git a/parse.y b/parse.y
index 9afea2c..1b48940 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.55 2015/01/18 14:01:17 florian Exp $	*/
+/*	$OpenBSD: parse.y,v 1.56 2015/01/19 19:37:50 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2015 Reyk Floeter <reyk@openbsd.org>
diff --git a/server.c b/server.c
index 522deb1..dfaa15c 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.52 2015/01/16 06:40:17 deraadt Exp $	*/
+/*	$OpenBSD: server.c,v 1.53 2015/01/19 19:37:50 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>
diff --git a/server_fcgi.c b/server_fcgi.c
index 8a6f5e6..8ae1f2f 100644
--- a/server_fcgi.c
+++ b/server_fcgi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server_fcgi.c,v 1.47 2015/01/18 14:01:17 florian Exp $	*/
+/*	$OpenBSD: server_fcgi.c,v 1.48 2015/01/19 19:37:50 reyk Exp $	*/
 
 /*
  * Copyright (c) 2014 Florian Obser <florian@openbsd.org>
diff --git a/server_http.c b/server_http.c
index b1338cf..99b6175 100644
--- a/server_http.c
+++ b/server_http.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server_http.c,v 1.65 2015/01/18 14:01:17 florian Exp $	*/
+/*	$OpenBSD: server_http.c,v 1.66 2015/01/19 19:37:50 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>
-- 
cgit v1.2.3-54-g00ecf