Some servers send no response to FTP QUIT command and just close the

connection. Remove result code check for QUIT. We gave them fair
warning.

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

diff --git a/modules/proxy/CHANGES b/modules/proxy/CHANGES
index d03f68c932bd74034ae2561c7cbdf56fe43300af..1ec2291504ff7335fbd8be6fa9677fe9cb3f01ab 100644 (file)
--- a/modules/proxy/CHANGES
+++ b/modules/proxy/CHANGES
@@ -1,6 +1,10 @@
 
 mod_proxy changes for httpd 2.0.18-dev
 
+  *) Remove result code check for FTP QUIT command. Some servers send
+     nothing at all back in response to QUIT.
+     [Chuck Murcko <chuck@topsail.org>]
+
   *) Reverse previous patch since the core reverted.
      [Chuck Murcko <chuck@topsail.org>]
 

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index a5cb91662e56fac6c23bcb463fc88504b6e8c23d..6565ea8ce89f9ecb34f6b89f45089d671216baff 100644 (file)
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -1637,16 +1637,7 @@ 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. */
-    /* FIXME
-     * Using ftp_getrc_msg is blocking here (in fact, anywhere after the
-     * while loop in section VI). Disabling for now, to get things working.
-     * 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_destroy(bb);
     return OK;
 }