From: Victor J. Orlikowski <orlikowski@apache.org>
Date: Thu, 28 Jun 2001 18:34:59 +0000 (+0000)
Subject: Maybe this will get PORT working again....
X-Git-Tag: 2.0.20~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88aa1ce4cf421a145892a6806d9d3231d06ac7de;p=thirdparty%2Fapache%2Fhttpd.git

Maybe this will get PORT working again....
break inside a switch statement inside a for loop
breaks out of the switch statement, not the for loop.


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

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 4ff52939a2b..02bb1416355 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -1530,13 +1530,14 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
         for(;;)
         {
 /* FIXME: this does not return, despite the incoming connection being accepted */
-            switch(rv = apr_accept(&remote_sock, local_sock, r->pool))
-            {
-            case APR_EINTR:
+            rv = apr_accept(&remote_sock, local_sock, r->pool);
+            if (rv == APR_EINTR) {
                 continue;
-            case APR_SUCCESS:
+            }
+            else if (rv == APR_SUCCESS) {
                 break;
-            default:
+            }
+            else {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
                               "proxy: FTP: failed to accept data connection");
                 return HTTP_BAD_GATEWAY;