summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-12-04 02:44:43 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-12-04 02:44:43 +0000
commit5a88d67e9c477588bd33cfd2c9ea8779c789ca2d (patch)
treef076b5d1c26c4c8f848b944994b6a21da924af56
parent39c0875a311e18e682ebe236771ff2e97ae52527 (diff)
stop viral header propagation. none of this code uses sys/hash.h
from Max Fillinger
-rw-r--r--usr.sbin/httpd/httpd.c5
-rw-r--r--usr.sbin/httpd/parse.y3
-rw-r--r--usr.sbin/httpd/server.c3
-rw-r--r--usr.sbin/httpd/server_fcgi.c3
-rw-r--r--usr.sbin/httpd/server_file.c3
-rw-r--r--usr.sbin/httpd/server_http.c3
6 files changed, 6 insertions, 14 deletions
diff --git a/usr.sbin/httpd/httpd.c b/usr.sbin/httpd/httpd.c
index 23fd0240c53..e83d63bf2b9 100644
--- a/usr.sbin/httpd/httpd.c
+++ b/usr.sbin/httpd/httpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: httpd.c,v 1.26 2014/11/22 00:24:22 tedu Exp $ */
+/* $OpenBSD: httpd.c,v 1.27 2014/12/04 02:44:42 tedu Exp $ */
/*
* Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -22,7 +22,6 @@
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/resource.h>
-#include <sys/hash.h>
#include <net/if.h>
#include <netinet/in.h>
@@ -40,8 +39,6 @@
#include <unistd.h>
#include <ctype.h>
#include <pwd.h>
-#include <sha1.h>
-#include <md5.h>
#include "httpd.h"
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y
index 6aa156ecdb8..f02334f1392 100644
--- a/usr.sbin/httpd/parse.y
+++ b/usr.sbin/httpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.42 2014/11/20 05:51:20 jsg Exp $ */
+/* $OpenBSD: parse.y,v 1.43 2014/12/04 02:44:42 tedu Exp $ */
/*
* Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -30,7 +30,6 @@
#include <sys/stat.h>
#include <sys/queue.h>
#include <sys/ioctl.h>
-#include <sys/hash.h>
#include <net/if.h>
#include <net/pfvar.h>
diff --git a/usr.sbin/httpd/server.c b/usr.sbin/httpd/server.c
index 4aa8307c708..ebefc681e54 100644
--- a/usr.sbin/httpd/server.c
+++ b/usr.sbin/httpd/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.46 2014/10/31 13:49:52 jsing Exp $ */
+/* $OpenBSD: server.c,v 1.47 2014/12/04 02:44:42 tedu Exp $ */
/*
* Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -24,7 +24,6 @@
#include <sys/un.h>
#include <sys/uio.h>
#include <sys/tree.h>
-#include <sys/hash.h>
#include <net/if.h>
#include <netinet/in.h>
diff --git a/usr.sbin/httpd/server_fcgi.c b/usr.sbin/httpd/server_fcgi.c
index 32ccbc95f81..4353f2df4a4 100644
--- a/usr.sbin/httpd/server_fcgi.c
+++ b/usr.sbin/httpd/server_fcgi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server_fcgi.c,v 1.40 2014/10/25 03:23:49 lteo Exp $ */
+/* $OpenBSD: server_fcgi.c,v 1.41 2014/12/04 02:44:42 tedu Exp $ */
/*
* Copyright (c) 2014 Florian Obser <florian@openbsd.org>
@@ -23,7 +23,6 @@
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/tree.h>
-#include <sys/hash.h>
#include <net/if.h>
#include <netinet/in.h>
diff --git a/usr.sbin/httpd/server_file.c b/usr.sbin/httpd/server_file.c
index 3a71959f858..b1fdd49952f 100644
--- a/usr.sbin/httpd/server_file.c
+++ b/usr.sbin/httpd/server_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server_file.c,v 1.39 2014/10/25 03:23:49 lteo Exp $ */
+/* $OpenBSD: server_file.c,v 1.40 2014/12/04 02:44:42 tedu Exp $ */
/*
* Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -23,7 +23,6 @@
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/tree.h>
-#include <sys/hash.h>
#include <net/if.h>
#include <netinet/in.h>
diff --git a/usr.sbin/httpd/server_http.c b/usr.sbin/httpd/server_http.c
index 05e3381f73d..243e08339a1 100644
--- a/usr.sbin/httpd/server_http.c
+++ b/usr.sbin/httpd/server_http.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server_http.c,v 1.54 2014/10/25 03:23:49 lteo Exp $ */
+/* $OpenBSD: server_http.c,v 1.55 2014/12/04 02:44:42 tedu Exp $ */
/*
* Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -23,7 +23,6 @@
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/tree.h>
-#include <sys/hash.h>
#include <net/if.h>
#include <netinet/in.h>