You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2011/09/23 15:41:40 UTC
svn commit: r1174756 - in /httpd/mod_ftp/trunk: docs/manual/ftp/ftp_faq.xml
docs/manual/ftp/ftp_howto.xml docs/manual/ftp/ftp_intro.xml
docs/manual/ftp/ftp_tls.xml docs/manual/ftp/index.xml
docs/manual/mod/mod_ftp.xml modules/ftp/ftp_protocol.h
Author: jim
Date: Fri Sep 23 13:41:40 2011
New Revision: 1174756
URL: http://svn.apache.org/viewvc?rev=1174756&view=rev
Log:
Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change
Modified:
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.xml
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.xml
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.xml
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.xml
httpd/mod_ftp/trunk/docs/manual/ftp/index.xml
httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml
httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.xml?rev=1174756&r1=1174755&r2=1174756&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.xml Fri Sep 23 13:41:40 2011
@@ -20,7 +20,7 @@
limitations under the License.
-->
-<!--
+<!--
Original Copyright (c) 2005 Covalent Technologies
FTP Protocol module for Apache 2.0
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.xml?rev=1174756&r1=1174755&r2=1174756&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.xml Fri Sep 23 13:41:40 2011
@@ -20,7 +20,7 @@
limitations under the License.
-->
-<!--
+<!--
Original Copyright (c) 2005 Covalent Technologies
FTP Protocol module for Apache 2.0
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.xml?rev=1174756&r1=1174755&r2=1174756&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.xml Fri Sep 23 13:41:40 2011
@@ -20,7 +20,7 @@
limitations under the License.
-->
-<!--
+<!--
Original Copyright (c) 2005 Covalent Technologies
FTP Protocol module for Apache 2.0
@@ -57,7 +57,7 @@ is provided, followed by a discussion of
<seealso><a href="http://www.rfc-archive.org/getrfc.php?rfc=1579">RFC
1579 — Firewall-Friendly FTP</a></seealso>
<seealso><a href="http://www.rfc-archive.org/getrfc.php?rfc=4217">RFC
-4217 — Securing FTP with TLS</a></seealso>
+4217 — Securing FTP with TLS</a></seealso>
<seealso><module>mod_ssl</module></seealso>
<seealso><a href="../howto/auth.html">Authentication, Authorization
and Access Control</a></seealso>
@@ -65,7 +65,7 @@ and Access Control</a></seealso>
<section id="protocol_overview">
-<title>Overview of the FTP Protocol</title>
+<title>Overview of the FTP Protocol</title>
<p>The File Transfer Protocol (FTP) is designed to facilitate
bi-directional transfer of files and records between hosts on a TCP/IP
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.xml?rev=1174756&r1=1174755&r2=1174756&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.xml Fri Sep 23 13:41:40 2011
@@ -20,7 +20,7 @@
limitations under the License.
-->
-<!--
+<!--
Original Copyright (c) 2005 Covalent Technologies
FTP Protocol module for Apache 2.0
@@ -50,7 +50,7 @@
travel in the clear across the network, and could be readily
detected by a malicious intruder. Conversely, a user would not
easily be able to detect a spoofed server address because the
- server could not identify itself by certificate.</p>
+ server could not identify itself by certificate.</p>
<p>To address these limitations, the FTP over TLS protocol was
developed and became an Internet Standard described in <a
@@ -96,7 +96,7 @@
<code>RequireSSL</code> option, to make the server refuse any FTP
command until a TLS session is established.</p>
- <!-- ###FIXME### Investigate existing (and desired) data channel
+ <!-- ###FIXME### Investigate existing (and desired) data channel
protection level and write this paragraph.
Note: the FTP Server side is always the 'Server' in TLS context,
regardless of the direction of the data channel connection.
@@ -200,7 +200,7 @@
<br/>
SSLCertificateFile ssl/server.crt<br/>
SSLCertificateKeyFile ssl/server.key<br/>
- <br/>
+ <br/>
ErrorLog logs/ftps_error.log<br/>
<br/>
CustomLog logs/ftps_command.log ftp_command<br/>
@@ -220,7 +220,7 @@
</section>
<!--
<section id="clientauth">
-
+
<title>Client-side Certificate Authentication</title>
</section>
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/index.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/index.xml?rev=1174756&r1=1174755&r2=1174756&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/index.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/index.xml Fri Sep 23 13:41:40 2011
@@ -20,7 +20,7 @@
limitations under the License.
-->
-<!--
+<!--
Original Copyright (c) 2005 Covalent Technologies
FTP Protocol module for Apache 2.0
@@ -73,7 +73,7 @@
<section id="mod-ftp"><title><code>mod_ftp</code></title>
<p>Extensive documentation on the directives provided by this module
can be found in the <a href="../mod/mod_ftp.html"><code>mod_ftp</code> reference
-documentation</a>.
+documentation</a>.
</p>
</section>
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=1174756&r1=1174755&r2=1174756&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml Fri Sep 23 13:41:40 2011
@@ -30,7 +30,7 @@
<sourcefile>mod_ftp.c</sourcefile>
<identifier>ftp_module</identifier>
<compatibility>Apache 2.2 and higher</compatibility>
-
+
<summary>
<p>This module provides support for the File Transfer Protocol
within the Apache HTTP Server. It was originally developed by
@@ -48,7 +48,7 @@
<!-- References to other documents or directives -->
<seealso><a href="../ftp/">FTP Documentation</a></seealso>
<seealso><module>mod_ssl</module></seealso>
-
+
<directivesynopsis>
<name>FTP</name>
<description>Run an FTP Server on this host</description>
@@ -63,7 +63,7 @@
global configuration file.</note>
</usage>
</directivesynopsis>
-
+
<directivesynopsis>
<name>FTPActiveRange</name>
<description>Ports the server will use for connecting to the
@@ -171,7 +171,7 @@
<note>This directive is not supported on Windows.</note>
</usage>
</directivesynopsis>
-
+
<directivesynopsis>
<name>FTPDocRootEnv</name>
<description>Set the DocumentRoot based on the given environment
@@ -534,10 +534,10 @@
<dd><p>When the user presents a <code>USER {user@hostname}</code>
command, select a
<directive module="core">VirtualHost</directive> by the "hostname"
- text of the provided name. The
+ text of the provided name. The
<directive module="core">NameVirtualHost</directive> must be
- configured appropriately to match these hosts. If no named
- virtual host matches by its
+ configured appropriately to match these hosts. If no named
+ virtual host matches by its
<directive module="core">ServerName</directive> or any of its
<directive module="core">ServerAlias</directive>s, the login
falls into the first matching VirtualHost by IP, just as HTTP
@@ -575,8 +575,8 @@
the data channel</description>
<syntax>FTPPASVbindaddr <em>IP address</em></syntax>
<default>The specified
- <directive module="mod_ftp">FTPPASVaddr</directive>, or in its
- absense, the server's actual IP address of the control channel
+ <directive module="mod_ftp">FTPPASVaddr</directive>, or in its
+ absense, the server's actual IP address of the control channel
connection</default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
@@ -711,6 +711,6 @@
<note>This directive is not supported on Windows.</note>
</usage>
</directivesynopsis>
-
+
</modulesynopsis>
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h?rev=1174756&r1=1174755&r2=1174756&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h Fri Sep 23 13:41:40 2011
@@ -6,7 +6,7 @@
* another gmake (or a make ftp_protocol.h)
*
* Generated from ../.. on
- * Fri Aug 21 05:53:46 2009
+ * Thu Sep 17 13:02:27 2009
*/