--- httpd-2.2.6/modules/proxy/mod_proxy_connect.c.orig	2007-10-03 17:39:22.000000000 +0200
+++ httpd-2.2.6/modules/proxy/mod_proxy_connect.c.orig	2007-10-03 17:42:26.000000000 +0200
@@ -21,6 +21,8 @@ 
 #include "mod_proxy.h"
 #include "apr_poll.h"
 
+#define CONN_BLKSZ AP_IOBUFSIZE
+
 module AP_MODULE_DECLARE_DATA proxy_connect_module;
 
 /*
@@ -71,6 +73,50 @@ 
     return OK;
 }
 
+/* read available data (in blocks of CONN_BLKSZ) from c_i and copy to c_o */
+static int proxy_connect_transfer(request_rec *r, conn_rec *c_i, conn_rec *c_o,
+                                apr_bucket_brigade *bb, char *name)
+{
+    int rv;
+#ifdef DEBUGGING
+    apr_off_t len;
+#endif
+
+    do {
+      apr_brigade_cleanup(bb);
+      rv = ap_get_brigade(c_i->input_filters, bb, AP_MODE_READBYTES,
+                          APR_NONBLOCK_READ, CONN_BLKSZ);
+      if (rv == APR_SUCCESS) {
+          if (APR_BRIGADE_EMPTY(bb))
+              break;
+#ifdef DEBUGGING
+          len = -1;
+          apr_brigade_length(bb, 0, &len);
+          ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                        "proxy: CONNECT: read %" APR_OFF_T_FMT
+                        " bytes from %s", len, name);
+#endif
+          rv = ap_pass_brigade(c_o->output_filters, bb);
+          if (rv == APR_SUCCESS) {
+              ap_fflush(c_o->output_filters, bb);
+          } else {
+              ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                            "proxy: CONNECT: error on %s - ap_pass_brigade",
+                            name);
+          }
+      } else if (!APR_STATUS_IS_EAGAIN(rv)) {
+          ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,
+                        "proxy: CONNECT: error on %s - ap_get_brigade",
+                        name);
+      }
+    } while (rv == APR_SUCCESS);
+
+    if (APR_STATUS_IS_EAGAIN(rv)) {
+      rv = APR_SUCCESS;
+    }
+    return rv;
+}
+
 /* CONNECT handler */
 static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
                                  proxy_server_conf *conf,
@@ -79,6 +125,10 @@ 
 {
     apr_pool_t *p = r->pool;
     apr_socket_t *sock;
+    conn_rec *c = r->connection;
+    conn_rec *backconn;
+
+    apr_bucket_brigade *bb = apr_brigade_create(p, c->bucket_alloc);
     apr_status_t err, rv;
     apr_size_t i, o, nbytes;
     char buffer[HUGE_STRING_LEN];
@@ -205,6 +255,29 @@ 
         }
     }
 
+    /* setup polling for connection */
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                "proxy: CONNECT: setting up poll()");
+
+    if ((rv = apr_pollset_create(&pollset, 2, r->pool, 0)) != APR_SUCCESS) {
+      apr_socket_close(sock);
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+            "proxy: CONNECT: error apr_pollset_create()");
+        return HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    /* Add client side to the poll */
+    pollfd.p = r->pool;
+    pollfd.desc_type = APR_POLL_SOCKET;
+    pollfd.reqevents = APR_POLLIN;
+    pollfd.desc.s = client_socket;
+    pollfd.client_data = NULL;
+    apr_pollset_add(pollset, &pollfd);
+
+    /* Add the server side to the poll */
+    pollfd.desc.s = sock;
+    apr_pollset_add(pollset, &pollfd);
+
     /*
      * Step Three: Send the Request
      *