#include "http_main.h" for the chroot functions

fixes some implicit declaration warnings
ok henning@

15 files changed, 28 insertions, 13 deletions

diff --git a/usr.sbin/httpd/src/main/fdcache.c b/usr.sbin/httpd/src/main/fdcache.c
index 877fb2191d6..6118e57a2c9 100644
--- a/usr.sbin/httpd/src/main/fdcache.c
+++ b/usr.sbin/httpd/src/main/fdcache.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdcache.c,v 1.9 2003/05/12 17:35:44 henning Exp $ */
+/*	$OpenBSD: fdcache.c,v 1.10 2003/07/18 21:16:37 david Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Henning Brauer
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c b/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c
index 956b5f5faa3..670f3bf07d2 100644
--- a/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c
+++ b/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c
@@ -137,6 +137,7 @@
 #include "http_core.h"
 #include "http_request.h"
 #include "http_log.h"
+#include "http_main.h"
 #include "http_protocol.h"
 #include "ap_config.h"
 #include "ap_ctype.h"
diff --git a/usr.sbin/httpd/src/modules/proxy/mod_proxy.c b/usr.sbin/httpd/src/modules/proxy/mod_proxy.c
index d3662ce598c..db88a2214c5 100644
--- a/usr.sbin/httpd/src/modules/proxy/mod_proxy.c
+++ b/usr.sbin/httpd/src/modules/proxy/mod_proxy.c
@@ -61,6 +61,7 @@
 #define CORE_PRIVATE
 
 #include "http_log.h"
+#include "http_main.h"
 #include "http_vhost.h"
 #include "http_request.h"
 
diff --git a/usr.sbin/httpd/src/modules/standard/mod_alias.c b/usr.sbin/httpd/src/modules/standard/mod_alias.c
index 6701c6d0403..3fc078612a0 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_alias.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_alias.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_alias.c,v 1.8 2002/08/15 16:06:11 henning Exp $ */
+/*	$OpenBSD: mod_alias.c,v 1.9 2003/07/18 21:16:37 david Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -70,6 +70,7 @@
 #include "http_core.h"
 #include "http_config.h"
 #include "http_log.h"
+#include "http_main.h"
 
 typedef struct {
     char *real;
diff --git a/usr.sbin/httpd/src/modules/standard/mod_auth.c b/usr.sbin/httpd/src/modules/standard/mod_auth.c
index 65b93ee85b1..32108971c19 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_auth.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_auth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_auth.c,v 1.9 2002/08/15 16:06:11 henning Exp $ */
+/*	$OpenBSD: mod_auth.c,v 1.10 2003/07/18 21:16:37 david Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -76,6 +76,7 @@
 #include "http_config.h"
 #include "http_core.h"
 #include "http_log.h"
+#include "http_main.h"
 #include "http_protocol.h"
 
 typedef struct auth_config_struct {
diff --git a/usr.sbin/httpd/src/modules/standard/mod_auth_db.c b/usr.sbin/httpd/src/modules/standard/mod_auth_db.c
index c38655e499d..30159093291 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_auth_db.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_auth_db.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_auth_db.c,v 1.10 2002/10/07 20:23:06 henning Exp $ */
+/*	$OpenBSD: mod_auth_db.c,v 1.11 2003/07/18 21:16:37 david Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -97,6 +97,7 @@
 #include "http_config.h"
 #include "http_core.h"
 #include "http_log.h"
+#include "http_main.h"
 #include "http_protocol.h"
 #include <db.h>
 
diff --git a/usr.sbin/httpd/src/modules/standard/mod_auth_dbm.c b/usr.sbin/httpd/src/modules/standard/mod_auth_dbm.c
index e57264ac7ea..fc444d33197 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_auth_dbm.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_auth_dbm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_auth_dbm.c,v 1.9 2002/08/15 16:06:11 henning Exp $ */
+/*	$OpenBSD: mod_auth_dbm.c,v 1.10 2003/07/18 21:16:37 david Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -76,6 +76,7 @@
 #include "http_config.h"
 #include "http_core.h"
 #include "http_log.h"
+#include "http_main.h"
 #include "http_protocol.h"
 #if (defined(WIN32) || defined(NETWARE))
 #include <sdbm.h>
diff --git a/usr.sbin/httpd/src/modules/standard/mod_log_agent.c b/usr.sbin/httpd/src/modules/standard/mod_log_agent.c
index da3a7e6dd71..db1cb9a88f8 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_log_agent.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_log_agent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_log_agent.c,v 1.5 2002/07/17 12:55:15 henning Exp $ */
+/*	$OpenBSD: mod_log_agent.c,v 1.6 2003/07/18 21:16:37 david Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -62,6 +62,7 @@
 #include "httpd.h"
 #include "http_config.h"
 #include "http_log.h"
+#include "http_main.h"
 #include "fdcache.h"
 
 module agent_log_module;
diff --git a/usr.sbin/httpd/src/modules/standard/mod_log_config.c b/usr.sbin/httpd/src/modules/standard/mod_log_config.c
index 420807cabf4..7048c507607 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_log_config.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_log_config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_log_config.c,v 1.12 2002/07/19 21:31:16 henning Exp $ */
+/*	$OpenBSD: mod_log_config.c,v 1.13 2003/07/18 21:16:37 david Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -185,6 +185,7 @@
 #include "http_config.h"
 #include "http_core.h"          /* For REMOTE_NAME */
 #include "http_log.h"
+#include "http_main.h"
 #include "fdcache.h"
 #include <limits.h>
 
diff --git a/usr.sbin/httpd/src/modules/standard/mod_log_referer.c b/usr.sbin/httpd/src/modules/standard/mod_log_referer.c
index ec11dfeb5c6..75d558ca3e0 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_log_referer.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_log_referer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_log_referer.c,v 1.5 2002/07/17 12:55:15 henning Exp $ */
+/*	$OpenBSD: mod_log_referer.c,v 1.6 2003/07/18 21:16:37 david Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -62,6 +62,7 @@
 #include "httpd.h"
 #include "http_config.h"
 #include "http_log.h"
+#include "http_main.h"
 #include "fdcache.h"
 
 module referer_log_module;
diff --git a/usr.sbin/httpd/src/modules/standard/mod_mime.c b/usr.sbin/httpd/src/modules/standard/mod_mime.c
index ace2c095529..cf3df6b4ad9 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_mime.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_mime.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_mime.c,v 1.11 2003/04/08 17:40:46 henning Exp $ */
+/*	$OpenBSD: mod_mime.c,v 1.12 2003/07/18 21:16:37 david Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -70,6 +70,7 @@
 #include "httpd.h"
 #include "http_config.h"
 #include "http_log.h"
+#include "http_main.h"
 
 /*
  * isascii(c) isn't universal, and even those places where it is
diff --git a/usr.sbin/httpd/src/modules/standard/mod_rewrite.c b/usr.sbin/httpd/src/modules/standard/mod_rewrite.c
index 65f00c9307e..5f84ee34e4d 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_rewrite.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_rewrite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_rewrite.c,v 1.17 2003/04/08 20:40:56 henning Exp $ */
+/*	$OpenBSD: mod_rewrite.c,v 1.18 2003/07/18 21:16:37 david Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -93,6 +93,7 @@
 
 
 #include "mod_rewrite.h"
+#include "http_main.h"
 #include "fdcache.h"
 
 #ifndef NO_WRITEV
diff --git a/usr.sbin/httpd/src/modules/standard/mod_so.c b/usr.sbin/httpd/src/modules/standard/mod_so.c
index 56ab08dae68..fe0e24101e4 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_so.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_so.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_so.c,v 1.10 2003/04/30 23:08:18 avsm Exp $ */
+/*	$OpenBSD: mod_so.c,v 1.11 2003/07/18 21:16:37 david Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -132,6 +132,7 @@
 #include "httpd.h"
 #include "http_config.h"
 #include "http_log.h"
+#include "http_main.h"
 
 module MODULE_VAR_EXPORT so_module;
 
diff --git a/usr.sbin/httpd/src/modules/standard/mod_userdir.c b/usr.sbin/httpd/src/modules/standard/mod_userdir.c
index abf19419238..2b783ee6208 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_userdir.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_userdir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_userdir.c,v 1.9 2002/08/15 16:06:11 henning Exp $ */
+/*	$OpenBSD: mod_userdir.c,v 1.10 2003/07/18 21:16:37 david Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -95,6 +95,7 @@
 
 #include "httpd.h"
 #include "http_config.h"
+#include "http_main.h"
 
 module userdir_module;
 
diff --git a/usr.sbin/httpd/src/modules/standard/mod_vhost_alias.c b/usr.sbin/httpd/src/modules/standard/mod_vhost_alias.c
index 9d863763426..a9124ba077d 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_vhost_alias.c
+++ b/usr.sbin/httpd/src/modules/standard/mod_vhost_alias.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mod_vhost_alias.c,v 1.6 2002/08/15 16:06:11 henning Exp $ */
+/*	$OpenBSD: mod_vhost_alias.c,v 1.7 2003/07/18 21:16:37 david Exp $ */
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -80,6 +80,7 @@
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
+#include "http_main.h"
 
 
 module MODULE_VAR_EXPORT vhost_alias_module;