Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 28 Jun 2001 21:29:20 -0000
Message-ID: <20010628212920.86267.qmail@apache.org>
From: orlikowski@apache.org
To: httpd-proxy-cvs@apache.org
Subject: cvs commit: httpd-proxy/module-2.0 proxy_ftp.c

orlikowski    01/06/28 14:29:20

  Modified:    module-2.0 proxy_ftp.c
  Log:
  Close the sockets, the right way this time.
  Use the ones that the connections are using, rather
  than those used to initialize the connection.
  
  Revision  Changes    Path
  1.68      +3 -2      httpd-proxy/module-2.0/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_ftp.c,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- proxy_ftp.c	2001/06/28 20:40:51	1.67
  +++ proxy_ftp.c	2001/06/28 21:29:19	1.68
  @@ -1592,7 +1592,7 @@
   	    apr_brigade_cleanup(bb);
   	}
   	ap_flush_conn(remote);
  -	apr_socket_close(remote_sock);
  +	apr_socket_close(remote->client_socket);
   	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
   		     "proxy: FTP: Closing Data connection.");
   	rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
  @@ -1650,7 +1650,8 @@
       rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
       ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
                    "proxy: FTP: %d %s", rc, buffer);
  -    apr_socket_close(sock);
  +    ap_flush_conn(origin);
  +    apr_socket_close(origin->client_socket);
       apr_brigade_destroy(bb);
       return OK;
   }