Remove IOLs from Apache. They are no longer necessary, now that we have

filtering beginning to work.  There is a hack that has been repeated
through this patch, we morph a pipe into a socket, and put the socket
into the BUFF.  Everytime we do that, we are working with a pipe from
a CGI, and we should be creating a pipe bucket and passing that bucket
back.  Because we don't actually have pipe buckets yet, we are using this
hack.  When we get pipe buckets, this will be fixed.


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

3 files changed, 5 insertions, 8 deletions

diff --git a/modules/proxy/proxy_connect.c b/modules/proxy/proxy_connect.c
index d5c14dd355..b8fe622863 100644
--- a/modules/proxy/proxy_connect.c
+++ b/modules/proxy/proxy_connect.c
@@ -61,7 +61,6 @@
 #include "mod_proxy.h"
 #include "http_log.h"
 #include "http_main.h"
-#include "ap_iol.h"
 
 #ifdef HAVE_BSTRING_H
 #include <bstring.h>        /* for IRIX, FD_SET calls bzero() */
@@ -211,7 +210,7 @@ int ap_proxy_connect_handler(request_rec *r, ap_cache_el  *c, char *url,
     }
 
     sock_buff = ap_bcreate(r->pool, B_RDWR);
-    ap_bpush_iol(sock_buff, ap_iol_attach_socket(sock));
+    ap_bpush_socket(sock_buff, sock);
 
     if(apr_setup_poll(&pollfd, 2, r->pool) != APR_SUCCESS)
     {
diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index a0a4f48c8e..62c85cfaca 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -62,7 +62,6 @@
 #include "http_main.h"
 #include "http_log.h"
 #include "http_core.h"
-#include "ap_iol.h"
 
 #define AUTODETECT_PWD
 
@@ -589,7 +588,7 @@ int ap_proxy_ftp_handler(request_rec *r, ap_cache_el  *c, char *url)
     }
 
     f = ap_bcreate(p, B_RDWR);
-    ap_bpush_iol(f, ap_iol_attach_socket(sock));
+    ap_bpush_socket(f, sock);
 /* shouldn't we implement telnet control options here? */
 
 #ifdef CHARSET_EBCDIC
@@ -1146,11 +1145,11 @@ int ap_proxy_ftp_handler(request_rec *r, ap_cache_el  *c, char *url)
             }
         }
         data = ap_bcreate(p, B_RDWR);
-        ap_bpush_iol(f, ap_iol_attach_socket(csd));
+        ap_bpush_socket(f, csd);
     }
     else {
         data = ap_bcreate(p, B_RDWR);
-        ap_bpush_iol(data, ap_iol_attach_socket(dsock));
+        ap_bpush_socket(data, dsock);
     }
 
 /* send response */
diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index cb2eaff524..0f7b550ce6 100644
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -63,7 +63,6 @@
 #include "http_main.h"
 #include "http_core.h"
 #include "util_date.h"
-#include "ap_iol.h"
 
 /*
  * Canonicalise http-like URLs.
@@ -269,7 +268,7 @@ int ap_proxy_http_handler(request_rec *r, ap_cache_el  *c, char *url,
     clear_connection(r->pool, r->headers_in);    /* Strip connection-based headers */
 
     f = ap_bcreate(p, B_RDWR);
-    ap_bpush_iol(f, ap_iol_attach_socket(sock));
+    ap_bpush_socket(f, sock);
 
     ap_bvputs(f, r->method, " ", proxyhost ? url : urlptr, " HTTP/1.0" CRLF,
               NULL);