httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r609890 - in /httpd/mod_ftp/trunk/docs/manual/mod: mod_ftp.html.en mod_ftp.xml
Date Tue, 08 Jan 2008 06:52:59 GMT
Author: wrowe
Date: Mon Jan  7 22:52:59 2008
New Revision: 609890

URL: http://svn.apache.org/viewvc?rev=609890&view=rev
Log:
Initial documentation of the new FTPOptions.

Modified:
    httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en
    httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml

Modified: httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en?rev=609890&r1=609889&r2=609890&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en (original)
+++ httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en Mon Jan  7 22:52:59 2008
@@ -13,11 +13,11 @@
 <body>
 <div id="page-header">
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a>
| <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a>
| <a href="../sitemap.html">Sitemap</a></p>
-<p class="apache">Apache HTTP Server Version 2.3</p>
+<p class="apache">Apache HTTP Server Version 2.2</p>
 <img alt="" src="../images/feather.gif" /></div>
 <div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif"
/></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP
Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a>
&gt; <a href="../">Version 2.3</a> &gt; <a href="./">Modules</a></div>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP
Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a>
&gt; <a href="../">Version 2.2</a> &gt; <a href="./">Modules</a></div>
 <div id="page-content">
 <div id="preamble"><h1>Apache Module mod_ftp</h1>
 <div class="toplang">
@@ -533,6 +533,26 @@
             as most standard FTP servers, where users see the list of
 	    all files and directories, even those they are not allowed
 	    to access.</p>
+	</dd>
+	<dt><code>StripHostname</code></dt>
+	<dd><p>When the user presents a <code>USER {user@hostname}</code>
+            command, strip the "@hostname" text from the provided name
+            before presenting "user" to the authentication modules.
+            Most commonly used in conjunction with the
+            <code class="directive">VirtualHostByUser</code> option below.</p>
+	</dd>
+	<dt><code>VirtualHostByName</code></dt>
+	<dd><p>When the user presents a <code>USER {user@hostname}</code>
+            command, select a
+            <code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code>
by the "hostname"
+            text of the provided name.  The 
+            <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>
must be
+            configured appropriately to match these hosts.  If no named 
+            virtual host matches by its 
+            <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>
or any of its
+            <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code>s,
the login
+            falls into the first matching VirtualHost by IP, just as HTTP
+            treats an unmatched <code>Host:</code> header.</p>
 	</dd>
       </dl>
     

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=609890&r1=609889&r2=609890&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml Mon Jan  7 22:52:59 2008
@@ -500,6 +500,26 @@
 	    all files and directories, even those they are not allowed
 	    to access.</p>
 	</dd>
+	<dt><code>StripHostname</code></dt>
+	<dd><p>When the user presents a <code>USER {user@hostname}</code>
+            command, strip the "@hostname" text from the provided name
+            before presenting "user" to the authentication modules.
+            Most commonly used in conjunction with the
+            <directive>VirtualHostByUser</directive> option below.</p>
+	</dd>
+	<dt><code>VirtualHostByName</code></dt>
+	<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 
+            <directive module="core">NameVirtualHost</directive> must be
+            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
+            treats an unmatched <code>Host:</code> header.</p>
+	</dd>
       </dl>
     </usage>
   </directivesynopsis>



Mime
View raw message