httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From orlikow...@apache.org
Subject cvs commit: httpd-proxy/module-2.0 proxy_ftp.c
Date Thu, 28 Jun 2001 18:35:01 GMT
orlikowski    01/06/28 11:35:01

  Modified:    module-2.0 proxy_ftp.c
  Log:
  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.
  
  Revision  Changes    Path
  1.64      +6 -5      httpd-proxy/module-2.0/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_ftp.c,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- proxy_ftp.c	2001/06/28 18:01:21	1.63
  +++ proxy_ftp.c	2001/06/28 18:34:59	1.64
  @@ -1530,13 +1530,14 @@
           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;
  
  
  

Mime
View raw message