Add ap_buckets_pipe.c and remove iol_socket and iol_file

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

diff --git a/ApacheCore.def b/ApacheCore.def
index 2d9e823d55c007e8591521fd4b8ee43a4a0a4cec..77cf191268399cfb89f64c7528e80ef6128741f4 100644 (file)
--- a/ApacheCore.def
+++ b/ApacheCore.def
@@ -37,8 +37,8 @@ EXPORTS
        ap_blookc   @30
        ;ap_bnonblock   @31
        ap_bonerror   @32
-       ap_bpush_iol @33
-        ap_bpop_iol @34
+;      ap_bpush_iol @33
+;        ap_bpop_iol @34
        ap_bputs   @35
 ;      ap_bread   @36
        ap_bsetflag   @37

diff --git a/ApacheCore.dsp b/ApacheCore.dsp
index 0e3b2fb9a905a67781f4ee8cd3a4a965caafa908..c26b7c42e7dcdca86363c57f78bdc76b8dabc4e3 100644 (file)
--- a/ApacheCore.dsp
+++ b/ApacheCore.dsp
@@ -106,6 +106,10 @@ SOURCE=.\ap\ap_buckets_mmap.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\ap\ap_buckets_pipe.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\ap\ap_buckets_refcount.c
 # End Source File
 # Begin Source File
@@ -158,14 +162,6 @@ SOURCE=.\main\http_vhost.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\main\iol_file.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\main\iol_socket.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\main\listen.c
 # End Source File
 # Begin Source File
@@ -306,6 +302,10 @@ SOURCE=.\include\ap_base64.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\ap_buckets.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\ap_config.h
 # End Source File
 # Begin Source File

diff --git a/httpd.dsp b/httpd.dsp
index 0e3b2fb9a905a67781f4ee8cd3a4a965caafa908..c26b7c42e7dcdca86363c57f78bdc76b8dabc4e3 100644 (file)
--- a/httpd.dsp
+++ b/httpd.dsp
@@ -106,6 +106,10 @@ SOURCE=.\ap\ap_buckets_mmap.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\ap\ap_buckets_pipe.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\ap\ap_buckets_refcount.c
 # End Source File
 # Begin Source File
@@ -158,14 +162,6 @@ SOURCE=.\main\http_vhost.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\main\iol_file.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\main\iol_socket.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\main\listen.c
 # End Source File
 # Begin Source File
@@ -306,6 +302,10 @@ SOURCE=.\include\ap_base64.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\ap_buckets.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\ap_config.h
 # End Source File
 # Begin Source File

diff --git a/libhttpd.def b/libhttpd.def
index 2d9e823d55c007e8591521fd4b8ee43a4a0a4cec..77cf191268399cfb89f64c7528e80ef6128741f4 100644 (file)
--- a/libhttpd.def
+++ b/libhttpd.def
@@ -37,8 +37,8 @@ EXPORTS
        ap_blookc   @30
        ;ap_bnonblock   @31
        ap_bonerror   @32
-       ap_bpush_iol @33
-        ap_bpop_iol @34
+;      ap_bpush_iol @33
+;        ap_bpop_iol @34
        ap_bputs   @35
 ;      ap_bread   @36
        ap_bsetflag   @37