Remove iol_socket.h. This file had one declaration, and it makes more

sense for that declaraion to move to ap_iol.h.  This also modifies all of
the files that include iol_socket.h to include ap_iol.h

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85934 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 0d437bf863ef772de8f23d2b7f32ac97c802fdb2..cbd982e9820f6f5eabf26072c80d34a0fbf158ab 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -89,7 +89,7 @@
 #include "http_conf_globals.h" 
 #include "buff.h" 
 #include "ap_mpm.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "unixd.h"
 #include <sys/stat.h>
 #ifdef HAVE_SYS_SOCKET_H

diff --git a/modules/proxy/proxy_connect.c b/modules/proxy/proxy_connect.c
index a7811aef6a8b7e74872c6ebb58f84d33af50fb4b..4434254cf870d7324d81bff33bbb06727141f9cd 100644 (file)
--- a/modules/proxy/proxy_connect.c
+++ b/modules/proxy/proxy_connect.c
@@ -61,7 +61,7 @@
 #include "mod_proxy.h"
 #include "http_log.h"
 #include "http_main.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 
 #ifdef HAVE_BSTRING_H
 #include <bstring.h>        /* for IRIX, FD_SET calls bzero() */

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 15c9e40b68ce0f8d443cba7c7d7edcfbfb32aad4..2a82df98dbd8380d1fd4858e52ac8f552e6a2cdb 100644 (file)
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -62,7 +62,7 @@
 #include "http_main.h"
 #include "http_log.h"
 #include "http_core.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 
 #define AUTODETECT_PWD
 

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index e22ef00e6c25d5a665dd9d0d40df4e3b0b2682cc..7fc91b51d95a6cac365ca23802f39581aac5e4fa 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -63,7 +63,7 @@
 #include "http_main.h"
 #include "http_core.h"
 #include "util_date.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 
 /*
  * Canonicalise http-like URLs.

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 4bcaf1701e817bde86cb9513931437d831809276..4eda2e69d9d9dda071c04030b0b99c7b220ea286 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -76,7 +76,7 @@
 #include "http_connection.h"
 #include "ap_mpm.h"
 #include "beosd.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "scoreboard.h" 
 #include <kernel/OS.h>

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 6b1388ec67bef94cb2c1492e375deef94b5b2bba..88ccc52f91932a1da2a154a5ee1b0d9ced536f4f 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -71,7 +71,7 @@
 #include "ap_mpm.h"
 #include "unixd.h"
 #include "mpm_common.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "mpm_default.h"
 #include "mpm.h"

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index e320394ab98f3511fd4335c8e9ee9d5fd476657e..a00c86e2cb04b98d1e1320b5afd2af59d2fd4eb4 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -73,7 +73,7 @@
 #include "ap_mpm.h"
 #include "unixd.h"
 #include "mpm_common.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "mpm_default.h"
 #include "mpm.h"

diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index 6c5c1992025be526466fff34b152128ac0527aca..0efb41167720e0fc881dd7ce9e44fe3d30a569d3 100644 (file)
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -72,7 +72,7 @@
 #include "http_connection.h"
 #include "ap_mpm.h"
 #include "beosd.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "scoreboard.h" 
 #include "poll.h"

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 0ae5cf28489b91ce83112b858364e13c9373ac65..11e81420f93a0413704e5b6c6ff1f15f544c8e3a 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -72,7 +72,7 @@
 #include "ap_mpm.h"
 #include "unixd.h"
 #include "mpm_common.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "scoreboard.h" 
 

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index e320394ab98f3511fd4335c8e9ee9d5fd476657e..a00c86e2cb04b98d1e1320b5afd2af59d2fd4eb4 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -73,7 +73,7 @@
 #include "ap_mpm.h"
 #include "unixd.h"
 #include "mpm_common.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "mpm_default.h"
 #include "mpm.h"

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index e32911b140dcd24527109669734412df3bc692dd..e22cf248a71f3cbed0e78f0997ae8fc900329e23 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -103,7 +103,7 @@
 #include "ap_mpm.h"
 #include "unixd.h"
 #include "mpm_common.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "ap_mmn.h"
 #ifdef HAVE_SYS_TYPES_H

diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 978b6be274778ffd80a208ffb97c7dfe434aeb8c..c004e925aafd7fff88fea60d2e905e08e0219e75 100644 (file)
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -71,7 +71,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "ap_listen.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "apr_portable.h"
 #include "mpm_common.h"
 

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 31012e40c095995edabf74adbc06604331270732..a4c05604e0602428e126a5ce1a4b8ccf14b35e9c 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -70,7 +70,7 @@
 #include "ap_config.h"
 #include "ap_listen.h"
 #include "mpm_default.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "mpm_winnt.h"
 #include "mpm_common.h"