Commit 06b50769 authored by Chuck Murcko's avatar Chuck Murcko
Browse files

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
parent 1d268b24

modules/proxy/CHANGES

+4 −0
Original line number Diff line number Diff line 


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>]

modules/proxy/proxy_ftp.c

+1 −10
Original line number Diff line number Diff line
@@ -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;

}