httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r601478 - in /httpd/mod_ftp/trunk: docs/manual/mod/mod_ftp.xml modules/ftp/mod_ftp.c
Date Wed, 05 Dec 2007 19:31:21 GMT
Author: wrowe
Date: Wed Dec  5 11:31:20 2007
New Revision: 601478

URL: http://svn.apache.org/viewvc?rev=601478&view=rev
Log:
FTPEPSVIgnoreFamily is the sort of directive that a typical installation
would use globally or not at all, depending on the physical topography.

Drop the no-inherit aspect of epsv_ignore_family.

Modified:
    httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml
    httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c

Modified: httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml?rev=601478&r1=601477&r2=601478&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml Wed Dec  5 11:31:20 2007
@@ -209,8 +209,6 @@
         in order to work around network address translation which presented
         an apparently different family.
         You may find this useful when the FTP Server is behind a firewall.</p>
-      <note>This directive is <strong>not</strong> inherited from the global
-        configuration file.</note>
     </usage>
   </directivesynopsis>
 

Modified: httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c?rev=601478&r1=601477&r2=601478&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c Wed Dec  5 11:31:20 2007
@@ -101,6 +101,8 @@
 
         if (fsc->pasv_min == FTP_UNSPEC)
             fsc->pasv_min = fsc->pasv_max = 0;
+        if (fsc->epsv_ignore_family == FTP_UNSPEC)
+            fsc->epsv_ignore_family = 0;
 
         if (fsc->data_block_size == FTP_UNSPEC)
             fsc->data_block_size = FTP_DATA_BLOCK_SIZE;
@@ -145,6 +147,7 @@
     fsc->active_max         = FTP_UNSPEC;
     fsc->pasv_min           = FTP_UNSPEC;
     fsc->pasv_max           = FTP_UNSPEC;
+    fsc->epsv_ignore_family = FTP_UNSPEC;
 
     fsc->data_block_size    = FTP_UNSPEC;
 
@@ -184,6 +187,9 @@
     if (fsc->pasv_min == FTP_UNSPEC) {
         fsc->pasv_min = base->pasv_min;
         fsc->pasv_max = base->pasv_max;
+    }
+    if (fsc->epsv_ignore_family == FTP_UNSPEC) {
+        fsc->epsv_ignore_family = base->epsv_ignore_family;
     }
 
     if (fsc->data_block_size == FTP_UNSPEC) {



Mime
View raw message