From be727972faf5fff1cc681a1a543d65d93053b2b3 Mon Sep 17 00:00:00 2001 From: Chuck Murcko Date: Thu, 28 Jun 2001 10:00:07 +0000 Subject: [PATCH] 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 --- modules/proxy/CHANGES | 4 ++++ modules/proxy/proxy_ftp.c | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/modules/proxy/CHANGES b/modules/proxy/CHANGES index d03f68c932..1ec2291504 100644 --- 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 ] + *) Reverse previous patch since the core reverted. [Chuck Murcko ] diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c index a5cb91662e..6565ea8ce8 100644 --- 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; } -- 2.50.1