Commit e0df8f27 authored by Victor J. Orlikowski's avatar Victor J. Orlikowski
Browse files

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
parent 96639650

modules/proxy/proxy_ftp.c

+5 −0
Original line number Diff line number Diff line
@@ -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");