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_file.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_file.c')
| -rw-r--r-- | server_file.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/server_file.c b/server_file.c index 447a0dd..2add01e 100644 --- a/server_file.c +++ b/server_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server_file.c,v 1.47 2015/01/16 06:40:17 deraadt Exp $ */ +/* $OpenBSD: server_file.c,v 1.48 2015/01/21 22:21:05 reyk Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -17,18 +17,10 @@ */ #include <sys/types.h> -#include <sys/queue.h> #include <sys/time.h> #include <sys/stat.h> -#include <sys/socket.h> -#include <sys/un.h> -#include <sys/tree.h> - -#include <net/if.h> -#include <netinet/in.h> -#include <netinet/ip.h> -#include <netinet/tcp.h> +#include <limits.h> #include <errno.h> #include <fcntl.h> #include <stdlib.h> @@ -37,7 +29,6 @@ #include <stdio.h> #include <dirent.h> #include <time.h> -#include <err.h> #include <event.h> #include "httpd.h" |