From: Victor J. Orlikowski <orlikowski@apache.org>
Date: Thu, 28 Jun 2001 07:04:18 +0000 (+0000)
Subject: ftp_getrc_msg is blocking for no good reason after the receive loop.
X-Git-Tag: 2.0.20~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d59cbf8a619de97065ffda9b0aef03a2ee0805c5;p=thirdparty%2Fapache%2Fhttpd.git

ftp_getrc_msg is blocking for no good reason after the receive loop.
Disable it till we figure out what's going on. ;(
At least it works now.


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

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 09c27727421..a5cb91662e5 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -1640,10 +1640,13 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     /* responses: 221, 500 */
     /*   221 Service closing control connection. */
     /*   500 Syntax error, command unrecognized. */
-    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);
-
+    /* 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;
 }