From: Victor J. Orlikowski <orlikowski@apache.org>
Date: Thu, 28 Jun 2001 17:49:54 +0000 (+0000)
Subject: proxy_ftp.c
X-Git-Tag: 2.0.20~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8194f25a1ef5b765f74a1c482ec17b80fdcce683;p=apache

proxy_ftp.c


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

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 6565ea8ce8..17ef5e36fb 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -1591,10 +1591,11 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
 	    ap_pass_brigade(r->output_filters, bb);
 	    apr_brigade_cleanup(bb);
 	}
+	ap_flush_conn(remote);
+	apr_socket_close(remote_sock);
 	apr_brigade_cleanup(bb);
 	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
 		     "proxy: FTP: end body send");
-
     }
     else {
 
@@ -1637,7 +1638,13 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     ap_pass_brigade(origin->output_filters, bb);
     ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
                  "proxy: FTP: QUIT");
-
+    /* responses: 221, 500 */
+    /* 221 Service closing control connection. */
+    /* 500 Syntax error, command unrecognized. */
+    i = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: %d %s", i, buffer);
+    apr_socket_close(sock);
     apr_brigade_destroy(bb);
     return OK;
 }