svn commit: r581478 - /httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c

[wr...@apache.org]

Author: wrowe
Date: Tue Oct  2 19:38:47 2007
New Revision: 581478

URL: http://svn.apache.org/viewvc?rev=581478&view=rev
Log:
Don't shoot ourselves in the proverbial foot; the same init_pasv logic
is used for both a PASV and EPSV commmand, we don't want to cripple an
EPSV following EPSV ALL.

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c?rev=581478&r1=581477&r2=581478&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Tue Oct  2 19:38:47 2007
@@ -1389,11 +1389,6 @@
     apr_port_t port;
     int found_port;
 
-    if (fc->all_epsv) {
-        fc->response_notes = apr_pstrdup(r->pool, "Restricted by EPSV ALL ");
-        return FTP_REPLY_BAD_SEQUENCE;
-    }
-
     if (fc->csock) {
         apr_socket_close(fc->csock);
         fc->csock = NULL;
@@ -1602,6 +1597,11 @@
     short high, low; 
     const char *addr;
     int family;
+
+    if (fc->all_epsv) {
+        fc->response_notes = apr_pstrdup(r->pool, "Restricted by EPSV ALL ");
+        return FTP_REPLY_BAD_SEQUENCE;
+    }
 
     if (fsc->pasv_bindaddr) {
         addr = fsc->pasv_bindaddr;