summaryrefslogtreecommitdiff
path: root/httpd.c
diff options
context:
space:
mode:
authorReyk Floeter <reyk@esdenera.com>2015-02-05 04:17:24 +0100
committerReyk Floeter <reyk@esdenera.com>2015-02-05 04:17:24 +0100
commitf8166531e6655bcd2f0514d74dd61e864a8794c3 (patch)
tree9779360761ca62ef40d2e9696b367e4d7fa5e9ea /httpd.c
parent1464756f1275128f9c68a9ddfe560ae952655928 (diff)
downloadhttpd-f8166531e6655bcd2f0514d74dd61e864a8794c3.tar.gz
httpd-f8166531e6655bcd2f0514d74dd61e864a8794c3.zip
sync with -current: fix includes, log remote user, fix ports by name.
Diffstat (limited to 'httpd.c')
-rw-r--r--httpd.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/httpd.c b/httpd.c
index f229cc5..5ea455e 100644
--- a/httpd.c
+++ b/httpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: httpd.c,v 1.30 2015/01/19 19:37:50 reyk Exp $ */
+/* $OpenBSD: httpd.c,v 1.31 2015/01/21 22:21:05 reyk Exp $ */
/*
* Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -23,16 +23,15 @@
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/resource.h>
-#include <sys/signal.h>
-#include <net/if.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-#include <fcntl.h>
+#include <stdarg.h>
+#include <string.h>
+#include <signal.h>
#include <getopt.h>
#include <fnmatch.h>
#include <err.h>