From: Victor J. Orlikowski <orlikowski@apache.org>
Date: Thu, 28 Jun 2001 20:29:45 +0000 (+0000)
Subject: Get the messages returned from the FTP Server in order.
X-Git-Tag: 2.0.20~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed7d24c13b5ebb16d36568e343e7794c94162e72;p=thirdparty%2Fapache%2Fhttpd.git

Get the messages returned from the FTP Server in order.
Otherwise we break RFC959.


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

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 1b318b1f878..dff676ff26e 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -1593,6 +1593,11 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
 	}
 	ap_flush_conn(remote);
 	apr_socket_close(remote_sock);
+	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+		     "proxy: FTP: Closing Data connection.");
+	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_brigade_cleanup(bb);
 	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
 		     "proxy: FTP: end body send");