httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy proxy_ftp.c proxy_http.c
Date Tue, 18 Dec 2001 20:29:27 GMT
trawick     01/12/18 12:29:27

  Modified:    modules/proxy proxy_ftp.c proxy_http.c
  Log:
  get proxy in sync with the update to ap_run_create_connection
  
  Revision  Changes    Path
  1.84      +2 -2      httpd-2.0/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- proxy_ftp.c	2001/11/30 19:17:47	1.83
  +++ proxy_ftp.c	2001/12/18 20:29:27	1.84
  @@ -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 */
  
  
  
  1.113     +1 -1      httpd-2.0/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- proxy_http.c	2001/11/18 16:59:38	1.112
  +++ proxy_http.c	2001/12/18 20:29:27	1.113
  @@ -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
  
  
  

Mime
View raw message