Commit b619e4f8 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Add some links and bits to the ap_expr docs 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1073543 13f79535-47bb-0310-9956-ffa450edef68
parent a3a41a92

docs/manual/expr.xml

+17 −6
Changes for docs/manual/expr.xml: 17 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -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>(</strong>" word "<strong>)</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>(</strong>" word "<strong>)</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>

docs/manual/mod/mod_authz_core.xml

+2 −2
Changes for docs/manual/mod/mod_authz_core.xml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -240,8 +240,8 @@ 
        Require expr %{TIME_HOUR} &gt;= 9 &amp; %{TIME_HOUR} &lt;= 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>

docs/manual/mod/mod_ssl.xml

+24 −0
Changes for docs/manual/mod/mod_ssl.xml: 24 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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>&lt;</code>,

<code>&lt;=</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>&lt;</code>,

<code>&lt;=</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>