From: Jeff Trawick <trawick@apache.org>
Date: Tue, 18 Dec 2001 20:29:27 +0000 (+0000)
Subject: get proxy in sync with the update to ap_run_create_connection
X-Git-Tag: 2.0.30~174
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c85d4a7c86aa13429bb9788669ffd96543583cb3;p=thirdparty%2Fapache%2Fhttpd.git

get proxy in sync with the update to ap_run_create_connection


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

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 78a32826092..c74c4d15151 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -747,7 +747,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     }
 
     /* the socket is now open, create a new connection */
-    origin = ap_run_create_connection(p, r->server, sock, r->connection->id);
+    origin = ap_run_create_connection(p, r->server, sock, r->connection->id, r->connection->sbh);
     if (!origin) {
 	/* the peer reset the connection already; ap_new_connection() 
 	 * closed the socket */
@@ -1550,7 +1550,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     }
 
     /* the transfer socket is now open, create a new connection */
-    remote = ap_run_create_connection(p, r->server, remote_sock, r->connection->id);
+    remote = ap_run_create_connection(p, r->server, remote_sock, r->connection->id, r->connection->sbh);
     if (!remote) {
 	/* the peer reset the connection already; ap_new_connection() 
 	 * closed the socket */
diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index a3bd3d1b023..5c375a591f6 100644
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -416,7 +416,7 @@ apr_status_t ap_proxy_http_create_connection(apr_pool_t *p, request_rec *r,
 
         /* the socket is now open, create a new backend server connection */
         *origin = ap_run_create_connection(c->pool, r->server, p_conn->sock,
-                                   r->connection->id);
+                                   r->connection->id, r->connection->sbh);
         if (!origin) {
         /* the peer reset the connection already; ap_new_connection() 
          * closed the socket