diff options
author | Reyk Floeter <reyk@esdenera.com> | 2015-02-05 04:17:24 +0100 |
---|---|---|
committer | Reyk Floeter <reyk@esdenera.com> | 2015-02-05 04:17:24 +0100 |
commit | f8166531e6655bcd2f0514d74dd61e864a8794c3 (patch) | |
tree | 9779360761ca62ef40d2e9696b367e4d7fa5e9ea /server.c | |
parent | 1464756f1275128f9c68a9ddfe560ae952655928 (diff) | |
download | httpd-f8166531e6655bcd2f0514d74dd61e864a8794c3.tar.gz httpd-f8166531e6655bcd2f0514d74dd61e864a8794c3.zip |
sync with -current: fix includes, log remote user, fix ports by name.
Diffstat (limited to 'server.c')
-rw-r--r-- | server.c | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.53 2015/01/19 19:37:50 reyk Exp $ */ +/* $OpenBSD: server.c,v 1.54 2015/01/21 22:21:05 reyk Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -22,26 +22,24 @@ #include <sys/time.h> #include <sys/stat.h> #include <sys/socket.h> -#include <sys/un.h> #include <sys/uio.h> #include <sys/tree.h> -#include <net/if.h> #include <netinet/in.h> -#include <netinet/ip.h> #include <netinet/tcp.h> +#include <arpa/inet.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> +#include <limits.h> #include <errno.h> #include <fcntl.h> -#include <stdlib.h> #include <string.h> #include <syslog.h> #include <unistd.h> -#include <stdio.h> -#include <err.h> -#include <pwd.h> #include <event.h> -#include <fnmatch.h> +#include <imsg.h> #include <tls.h> #include "httpd.h" |