httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1668878 - in /httpd/httpd/branches/2.4.x/docs/manual: expr.html.en mod/mod_alias.html.en mod/mod_ssl.html.en mod/quickreference.html.en
Date Tue, 24 Mar 2015 13:07:30 GMT
Author: covener
Date: Tue Mar 24 13:07:30 2015
New Revision: 1668878

URL: http://svn.apache.org/r1668878
Log:
xforms

Modified:
    httpd/httpd/branches/2.4.x/docs/manual/expr.html.en
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_alias.html.en
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.html.en
    httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en

Modified: httpd/httpd/branches/2.4.x/docs/manual/expr.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/expr.html.en?rev=1668878&r1=1668877&r2=1668878&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/expr.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/expr.html.en Tue Mar 24 13:07:30 2015
@@ -44,7 +44,7 @@
 <li><img alt="" src="./images/down.gif" /> <a href="#other">Other</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#sslrequire">Comparison
with SSLRequire</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#compatibility">Version
History</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a
href="./mod/core.html#if">&lt;If&gt;</a></code></li><li><code
class="directive"><a href="./mod/core.html#elseif">&lt;ElseIf&gt;</a></code></li><li><code
class="directive"><a href="./mod/core.html#else">&lt;Else&gt;</a></code></li><li><code
class="directive"><a href="./mod/mod_auth_basic.html#authbasicfake">AuthBasicFake</a></code></li><li><code
class="directive"><a href="./mod/mod_auth_form.html#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code></li><li><code
class="directive"><a href="./mod/mod_auth_form.html#authformloginsuccesslocation">AuthFormLoginSuccessLocation</a></code></li><li><code
class="directive"><a href="./mod/mod_auth_form.html#authformlogoutlocation">AuthFormLogoutLocation</a></code></li><li><code
class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code
class="directive"><a href="./mod/mod_setenvif.html#setenvifexpr">SetEnvIfExpr</
 a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code
class="directive"><a href="./mod/mod_headers.html#requestheader">RequestHeader</a></code></li><li><code
class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><a
href="mod/mod_authz_core.html#reqexpr">Require expr</a></li><li><a
href="mod/mod_authnz_ldap.html#requser">Require ldap-user</a></li><li><a
href="mod/mod_authnz_ldap.html#reqgroup">Require ldap-group</a></li><li><a
href="mod/mod_authnz_ldap.html#reqdn">Require ldap-dn</a></li><li><a
href="mod/mod_authnz_ldap.html#reqattribute">Require ldap-attribute</a></li><li><a
href="mod/mod_authnz_ldap.html#reqfilter">Require ldap-filter</a></li><li><a
href="mod/mod_authz_dbd.html#reqgroup">Require dbd-group</a></li><li><a
href="mod/mod_authz_dbm.html#reqgroup">Require dbm-group</a></li><li><a
href="mod/mod_authz_groupfile.html#reqgroup">Require group</a></li><li><a
href="mod/mod_a
 uthz_host.html#reqhost">Require host</a></li><li><code class="directive"><a
href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code></li><li><code
class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code></li><li><code
class="module"><a href="./mod/mod_include.html">mod_include</a></code></li></ul><ul
class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
+</ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a
href="./mod/core.html#if">&lt;If&gt;</a></code></li><li><code
class="directive"><a href="./mod/core.html#elseif">&lt;ElseIf&gt;</a></code></li><li><code
class="directive"><a href="./mod/core.html#else">&lt;Else&gt;</a></code></li><li><code
class="directive"><a href="./mod/mod_alias.html#alias">Alias</a></code></li><li><code
class="directive"><a href="./mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li><li><code
class="directive"><a href="./mod/mod_alias.html#redirect">Redirect</a></code></li><li><code
class="directive"><a href="./mod/mod_auth_basic.html#authbasicfake">AuthBasicFake</a></code></li><li><code
class="directive"><a href="./mod/mod_auth_form.html#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code></li><li><code
class="directive"><a href="./mod/mod_auth_form.html#authformloginsuccesslocation">AuthFormLoginSuccessLocation</a></code></li><li><code
class="directive"><a href="
 ./mod/mod_auth_form.html#authformlogoutlocation">AuthFormLogoutLocation</a></code></li><li><code
class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code
class="directive"><a href="./mod/mod_setenvif.html#setenvifexpr">SetEnvIfExpr</a></code></li><li><code
class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code
class="directive"><a href="./mod/mod_headers.html#requestheader">RequestHeader</a></code></li><li><code
class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><a
href="mod/mod_authz_core.html#reqexpr">Require expr</a></li><li><a
href="mod/mod_authnz_ldap.html#requser">Require ldap-user</a></li><li><a
href="mod/mod_authnz_ldap.html#reqgroup">Require ldap-group</a></li><li><a
href="mod/mod_authnz_ldap.html#reqdn">Require ldap-dn</a></li><li><a
href="mod/mod_authnz_ldap.html#reqattribute">Require ldap-attribute</a></li><li><a
href="mod/mod_authnz_ldap.html#req
 filter">Require ldap-filter</a></li><li><a href="mod/mod_authz_dbd.html#reqgroup">Require
dbd-group</a></li><li><a href="mod/mod_authz_dbm.html#reqgroup">Require
dbm-group</a></li><li><a href="mod/mod_authz_groupfile.html#reqgroup">Require
group</a></li><li><a href="mod/mod_authz_host.html#reqhost">Require
host</a></li><li><code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code></li><li><code
class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code></li><li><code
class="module"><a href="./mod/mod_include.html">mod_include</a></code></li></ul><ul
class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif"
/></a></div>
 <div class="section">
 <h2><a name="grammar" id="grammar">Grammar in Backus-Naur Form notation</a></h2>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_alias.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_alias.html.en?rev=1668878&r1=1668877&r2=1668878&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_alias.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_alias.html.en Tue Mar 24 13:07:30 2015
@@ -51,6 +51,15 @@
     a different URL. They are often used when a resource has moved to
     a new location.</p>
 
+    <p>When the <code class="directive"><a href="#alias">Alias</a></code>,
+    <code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
and 
+    <code class="directive"><a href="#redirect">Redirect</a></code>
directives are used
+    within a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
+    or <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
+    section, <a href="../expr.html">expression syntax</a> can be used
+    to manipulate the destination path or URL.
+	</p>
+
     <p><code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code>
is designed to handle simple URL
     manipulation tasks.  For more complicated tasks such as
     manipulating the query string, use the tools provided by
@@ -106,14 +115,24 @@ Alias /foo /gaq</pre>
     would always match before the <code>/foo/bar</code> <code class="directive"><a
href="#alias">Alias</a></code>, so the latter directive would be
     ignored.</p>
 
+    <p>When the <code class="directive"><a href="#alias">Alias</a></code>,
+    <code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
and 
+    <code class="directive"><a href="#redirect">Redirect</a></code>
directives are used
+    within a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
+    or <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
+    section, these directives will take precedence over any globally
+    defined <code class="directive"><a href="#alias">Alias</a></code>,
+    <code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
and 
+    <code class="directive"><a href="#redirect">Redirect</a></code>
directives.</p>
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="directive-section"><h2><a name="Alias" id="Alias">Alias</a>
<a name="alias" id="alias">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps
URLs to filesystem locations</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Alias
<var>URL-path</var>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Alias
[<var>URL-path</var>]
 <var>file-path</var>|<var>directory-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server
config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server
config, virtual host, directory</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_alias</td></tr>
 </table>
@@ -168,6 +187,20 @@ Alias /foo /gaq</pre>
     <p>Any number slashes in the <var>URL-path</var> parameter 
     matches any number of slashes in the requested URL-path.</p>
 
+    <p>If the <code class="directive">Alias</code> directive is used within
a
+    <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
+    or <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
+    section the URL-path is omitted, and the file-path is interpreted
+    using <a href="../expr.html">expression syntax</a>.</p>
+
+    <pre class="prettyprint lang-config">&lt;Location /image&gt;
+    Alias /ftp/pub/image
+&lt;/Location&gt;
+&lt;LocationMatch /error/(?&lt;NUMBER&gt;[0-9]+)&gt;
+    Alias /usr/local/apache/errors/%{env:MATCH_NUMBER}.html
+&lt;/LocationMatch&gt;</pre>
+
+
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
@@ -259,7 +292,7 @@ expressions</td></tr>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sends
an external redirect asking the client to fetch
 a different URL</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Redirect
[<var>status</var>] <var>URL-path</var>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Redirect
[<var>status</var>] [<var>URL-path</var>]
 <var>URL</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server
config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
@@ -299,14 +332,17 @@ Redirect /one /two</pre>
 	Note that <code>POST</code>s will be discarded.<br />
 	Only complete path segments are matched, so the above
     example would not match a request for
-    <code>http://example.com/servicefoo.txt</code>.  For more complex matching
-    using regular expressions, see the <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code>
directive.</p>
+    <code>http://example.com/servicefoo.txt</code>. For more complex matching
+    using the <a href="../expr.html">expression syntax</a>, omit the URL-path
+    argument as described below. Alternatively, for matching using regular
+    expressions, see the <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code>
directive.</p>
 
 
     <div class="note"><h3>Note</h3>
     <p>Redirect directives take precedence over Alias and ScriptAlias
     directives, irrespective of their ordering in the configuration
-    file.</p></div>
+    file. Redirect directives inside a Location take precedence over
+    Redirect and Alias directives with an URL-path.</p></div>
 
     <p>If no <var>status</var> argument is given, the redirect will
     be "temporary" (HTTP status 302). This indicates to the client
@@ -348,6 +384,24 @@ Redirect /one /two</pre>
 Redirect 303 /three http://example.com/other</pre>
 
 
+    <p>If the <code class="directive">Redirect</code> directive is used
within a
+    <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
+    or <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
+    section with the URL-path omitted, then the URL parameter will be
+    interpreted using <a href="../expr.html">expression syntax</a>.</p>
+
+    <pre class="prettyprint lang-config">&lt;Location /one&gt;
+    Redirect permanent http://example.com/two
+&lt;/Location&gt;<br />
+&lt;Location /three&gt;
+    Redirect 303 http://example.com/other
+&lt;/Location&gt;<br />
+&lt;LocationMatch /error/(?&lt;NUMBER&gt;[0-9]+)&gt;
+    Redirect permanent http://example.com/errors/%{env:MATCH_NUMBER}.html
+&lt;/LocationMatch&gt;<br />
+    </pre>
+
+
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
@@ -423,9 +477,9 @@ a different URL</td></tr>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps
a URL to a filesystem location and designates the
 target as a CGI script</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScriptAlias
<var>URL-path</var>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScriptAlias
[<var>URL-path</var>]
 <var>file-path</var>|<var>directory-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server
config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server
config, virtual host, directory</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_alias</td></tr>
 </table>
@@ -481,6 +535,21 @@ target as a CGI script</td></tr>
     of the CGI scripts if they are not restricted by a
     <code class="directive"><a href="../mod/core.html#directory">Directory</a></code>
section.</div>
 
+    <p>If the <code class="directive">ScriptAlias</code> directive is used
within
+    a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
+    or <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
+    section with the URL-path omitted, then the URL parameter will be
+    interpreted using <a href="../expr.html">expression syntax</a>.</p>
+
+    <pre class="prettyprint lang-config">&lt;Location /cgi-bin &gt;
+    ScriptAlias /web/cgi-bin/
+&lt;/Location&gt;
+&lt;LocationMatch /cgi-bin/errors/(?&lt;NUMBER&gt;[0-9]+)&gt;
+    ScriptAlias /web/cgi-bin/errors/%{env:MATCH_NUMBER}.cgi
+&lt;/LocationMatch&gt;<br />
+    </pre>
+
+
 
 <h3>See also</h3>
 <ul>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.html.en?rev=1668878&r1=1668877&r2=1668878&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.html.en Tue Mar 24 13:07:30 2015
@@ -165,6 +165,7 @@ compatibility variables.</p>
 <tr><td><code>SSL_CLIENT_A_KEY</code></td>              <td>string</td>
   <td>Algorithm used for the public key of client's certificate</td></tr>
 <tr><td><code>SSL_CLIENT_CERT</code></td>               <td>string</td>
   <td>PEM-encoded client certificate</td></tr>
 <tr><td><code>SSL_CLIENT_CERT_CHAIN_</code><em>n</em></td>
<td>string</td>    <td>PEM-encoded certificates in client certificate chain</td></tr>
+<tr><td><code>SSL_CLIENT_CERT_RFC4523_CEA</code></td>   <td>string</td>
   <td>Serial number and issuer of the certificate. The format matches that of the CertificateExactAssertion
in RFC4523</td></tr>
 <tr><td><code>SSL_CLIENT_VERIFY</code></td>             <td>string</td>
   <td><code>NONE</code>, <code>SUCCESS</code>, <code>GENEROUS</code>
or <code>FAILED:</code><em>reason</em></td></tr>
 <tr><td><code>SSL_SERVER_M_VERSION</code></td>          <td>string</td>
   <td>The version of the server certificate</td></tr>
 <tr><td><code>SSL_SERVER_M_SERIAL</code></td>           <td>string</td>
   <td>The serial of the server certificate</td></tr>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en?rev=1668878&r1=1668877&r2=1668878&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en Tue Mar 24 13:07:30
2015
@@ -111,8 +111,8 @@ responses from the server</td></tr>
 <tr><td><a href="mod_mime.html#addtype">AddType <var>media-type</var>
<var>extension</var>
 [<var>extension</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td
class="descr" colspan="4">Maps the given filename extensions onto the specified content
 type</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#alias">Alias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr
class="odd"><td class="descr" colspan="4">Maps URLs to filesystem locations</td></tr>
+<tr class="odd"><td><a href="mod_alias.html#alias">Alias [<var>URL-path</var>]
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>svd</td><td>B</td></tr><tr
class="odd"><td class="descr" colspan="4">Maps URLs to filesystem locations</td></tr>
 <tr><td><a href="mod_alias.html#aliasmatch">AliasMatch <var>regex</var>
 <var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td
class="descr" colspan="4">Maps URLs to filesystem locations using regular
 expressions</td></tr>
@@ -748,7 +748,7 @@ header for proxied requests</td></tr>
 <tr class="odd"><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName
<var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr
class="odd"><td class="descr" colspan="4">Name of the file that will be inserted
at the end
 of the index listing</td></tr>
 <tr><td><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize <var>bytes</var></a></td><td>
0 </td><td>s</td><td>M</td></tr><tr><td class="descr"
colspan="4">TCP receive buffer size</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>]
<var>URL-path</var>
+<tr class="odd"><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>]
[<var>URL-path</var>]
 <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr
class="odd"><td class="descr" colspan="4">Sends an external redirect asking the client
to fetch
 a different URL</td></tr>
 <tr><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>]
<var>regex</var>
@@ -827,8 +827,8 @@ user authentication</td></tr>
 the child processes</td></tr>
 <tr><td><a href="mod_actions.html#script">Script <var>method</var>
<var>cgi-script</var></a></td><td></td><td>svd</td><td>B</td></tr><tr><td
class="descr" colspan="4">Activates a CGI script for a particular request
 method.</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr
class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location and
designates the
+<tr class="odd"><td><a href="mod_alias.html#scriptalias">ScriptAlias [<var>URL-path</var>]
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>svd</td><td>B</td></tr><tr
class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location and
designates the
 target as a CGI script</td></tr>
 <tr><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
 <var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td
class="descr" colspan="4">Maps a URL to a filesystem location using a regular expression



Mime
View raw message