You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2011/02/23 00:17:50 UTC
svn commit: r1073543 - in /httpd/httpd/trunk/docs/manual: expr.xml
mod/mod_authz_core.xml mod/mod_ssl.xml
Author: sf
Date: Tue Feb 22 23:17:50 2011
New Revision: 1073543
URL: http://svn.apache.org/viewvc?rev=1073543&view=rev
Log:
Add some links and bits to the ap_expr docs
Modified:
httpd/httpd/trunk/docs/manual/expr.xml
httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml
httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml
Modified: httpd/httpd/trunk/docs/manual/expr.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.xml?rev=1073543&r1=1073542&r2=1073543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.xml (original)
+++ httpd/httpd/trunk/docs/manual/expr.xml Tue Feb 22 23:17:50 2011
@@ -31,14 +31,20 @@
for all configuration directives.
This document describes the <em>ap_expr</em> expression parser.
</p>
+ <p>The <em>ap_expr</em> expression is intended to replace most other
+ expression variants in HTTPD. For example, the deprecated
+ <directive module="mod_ssl">SSLRequire</directive> expressions can be
+ replaced by <a href="mod/mod_authz_core.html#reqexpr">Require expr</a>.
+ </p>
</summary>
<seealso><directive module="core">If</directive></seealso>
-<seealso><module>mod_rewrite</module></seealso>
-<seealso><module>mod_include</module></seealso>
-<seealso><module>mod_setenvif</module></seealso>
-<seealso><directive module="mod_ssl">SSLRequire</directive></seealso>
+<seealso><directive module="mod_rewrite">RewriteCond</directive></seealso>
+<seealso><directive module="mod_setenvif">SetEnvIfExpr</directive></seealso>
<seealso><directive module="mod_filter">FilterProvider</directive></seealso>
+<seealso><a href="mod/mod_authz_core.html#reqexpr">Require expr</a></seealso>
+<seealso><directive module="mod_ssl">SSLRequire</directive></seealso>
+<seealso><module>mod_include</module></seealso>
<section id="grammar">
<title>Grammar in BackusâNaur Form notation</title>
@@ -153,7 +159,11 @@ listfunction ::= listfuncname "<strong>(
<tr><td><code>REQUEST_URI</code></td>
<td>The URI of the request</td></tr>
<tr><td><code>REQUEST_FILENAME</code></td>
- <td></td></tr>
+ <td>The full local filesystem path to the file or script matching the
+ request, if this has already been determined by the server at the
+ time <code>REQUEST_FILENAME</code> is referenced. Otherwise, such
+ as when used in virtual host context, the same value as
+ <code>REQUEST_URI</code> </td></tr>
<tr><td><code>SCRIPT_FILENAME</code></td>
<td>Same as <code>REQUEST_FILENAME</code></td></tr>
<tr><td><code>SCRIPT_USER</code></td>
@@ -161,7 +171,8 @@ listfunction ::= listfuncname "<strong>(
<tr><td><code>SCRIPT_GROUP</code></td>
<td>The group name of the group of the script.</td></tr>
<tr><td><code>PATH_INFO</code></td>
- <td></td></tr>
+ <td>The trailing path name information, see
+ <directive module="core">AcceptPathInfo</directive></td></tr>
<tr><td><code>QUERY_STRING</code></td>
<td>The query string of the current request</td></tr>
<tr><td><code>IS_SUBREQ</code></td>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml?rev=1073543&r1=1073542&r2=1073543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml Tue Feb 22 23:17:50 2011
@@ -240,8 +240,8 @@
Require expr %{TIME_HOUR} >= 9 & %{TIME_HOUR} <= 17 <br />
</example>
- <p>TODO: Include a link to a description of the ap_expr syntax, once we have
- such a description.</p>
+ <p>The syntax is described in the <a href="../expr.html">ap_expr</a>
+ documentation.</p>
</section>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml?rev=1073543&r1=1073542&r2=1073543&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml Tue Feb 22 23:17:50 2011
@@ -1343,10 +1343,34 @@ the left-hand-side expression.</p></li>
</ul>
</note>
+<note><title>SSLRequire is deprecated</title>
+<p><code>SSLRequire</code> is deprecated and should in general be replaced
+by <a href="mod/mod_authz_core.html#reqexpr">Require expr</a>. The so called
+<a href="../expr.html">ap_expr</a> syntax of <code>Require expr</code> is
+a superset of the syntax of <code>SSLRequire</code>, with the following
+exception:</p>
+
+<p>In <code>SSLRequire</code>, the comparison operators <code><</code>,
+<code><=</code>, ... completely equivalent to the operators
+<code>lt</code>, <code>le</code>, ... and work in a somewhat pecular way that
+first compares the length of two strings and then the lexical order.
+On the other hand, <a href="../expr.html">ap_expr</a> has two sets of
+comparison operators: The operators <code><</code>,
+<code><=</code>, ... do lexical string comparison, while the operators
+<code>-lt</code>, <code>-le</code>, ... do integer comparison.
+For the latter, there are also aliases without the leading dashes:
+<code>lt</code>, <code>le</code>, ...
+</p>
+
+</note>
+
</usage>
<seealso><a href="../env.html">Environment Variables in Apache HTTP Server</a>,
for additional examples.
</seealso>
+<seealso><a href="mod/mod_authz_core.html#reqexpr">Require expr</a></seealso>
+<seealso><a href="../expr.html">Generic expression syntax in Apache HTTP Server</a>
+</seealso>
</directivesynopsis>
<directivesynopsis>