httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeff Trawick <traw...@attglobal.net>
Subject Re: proxy_http.c && proxy_ftp.c no compilee
Date Tue, 18 Dec 2001 19:20:42 GMT
<sterling@covalent.net> writes:

> I see the ap_run_create_connection interface was changed, but the proxy
> code was not updated yet....... right?

ouch...  can you try this?

Index: modules/proxy/proxy_ftp.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/proxy/proxy_ftp.c,v
retrieving revision 1.83
diff -u -r1.83 proxy_ftp.c
--- modules/proxy/proxy_ftp.c	2001/11/30 19:17:47	1.83
+++ modules/proxy/proxy_ftp.c	2001/12/18 19:20:50
@@ -747,7 +747,7 @@
     }
 
     /* 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 @@
     }
 
     /* 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 */
Index: modules/proxy/proxy_http.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/proxy/proxy_http.c,v
retrieving revision 1.112
diff -u -r1.112 proxy_http.c
--- modules/proxy/proxy_http.c	2001/11/18 16:59:38	1.112
+++ modules/proxy/proxy_http.c	2001/12/18 19:20:51
@@ -416,7 +416,7 @@
 
         /* 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

-- 
Jeff Trawick | trawick@attglobal.net | PGP public key at web site:
       http://www.geocities.com/SiliconValley/Park/9289/
             Born in Roswell... married an alien...

Mime
View raw message