You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2014/05/16 23:25:11 UTC
svn commit: r1595353 - in /httpd/httpd/trunk/docs/manual: expr.html.en
expr.xml
Author: jailletc36
Date: Fri May 16 21:25:10 2014
New Revision: 1595353
URL: http://svn.apache.org/r1595353
Log:
Add missing variables:
Introduced in r1132494
CONTEXT_PREFIX
CONTEXT_DOCUMENT_ROOT
and since the beginning of util_expr_eval.c for
HTTP_COOKIE
Description still missing.
+ synch layout with 2.4
Modified:
httpd/httpd/trunk/docs/manual/expr.html.en
httpd/httpd/trunk/docs/manual/expr.xml
Modified: httpd/httpd/trunk/docs/manual/expr.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.html.en?rev=1595353&r1=1595352&r2=1595353&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.html.en (original)
+++ httpd/httpd/trunk/docs/manual/expr.html.en Fri May 16 21:25:10 2014
@@ -52,12 +52,13 @@
<p><a href="http://en.wikipedia.org/wiki/Backus%E2%80%93Naur_Form">Backus-Naur
Form</a> (BNF) is a notation technique for context-free grammars,
often used to describe the syntax of languages used in computing.
- In most cases, expressions are used to express boolean values. For
- these, the starting point in the BNF is <code>expr</code>.
+ In most cases, expressions are used to express boolean values.
+ For these, the starting point in the BNF is <code>expr</code>.
However, a few directives like <code class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code> accept expressions
that evaluate to a string value. For those, the starting point in
the BNF is <code>string</code>.
</p>
+<blockquote>
<pre>expr ::= "<strong>true</strong>" | "<strong>false</strong>"
| "<strong>!</strong>" expr
| expr "<strong>&&</strong>" expr
@@ -118,6 +119,7 @@ rebackref ::= "<strong>$</strong>" [0-
function ::= funcname "<strong>(</strong>" word "<strong>)</strong>"
listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pre>
+</blockquote>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
@@ -142,11 +144,12 @@ listfunction ::= listfuncname "<strong>(
<table class="bordered"><tr class="header"><th>Name</th></tr>
<tr><td><code>HTTP_ACCEPT</code></td></tr>
-<tr class="odd"><td><code>HTTP_FORWARDED</code></td></tr>
-<tr><td><code>HTTP_HOST</code></td></tr>
-<tr class="odd"><td><code>HTTP_PROXY_CONNECTION</code></td></tr>
-<tr><td><code>HTTP_REFERER</code></td></tr>
-<tr class="odd"><td><code>HTTP_USER_AGENT</code></td></tr>
+<tr class="odd"><td><code>HTTP_COOKIE</code></td></tr>
+<tr><td><code>HTTP_FORWARDED</code></td></tr>
+<tr class="odd"><td><code>HTTP_HOST</code></td></tr>
+<tr><td><code>HTTP_PROXY_CONNECTION</code></td></tr>
+<tr class="odd"><td><code>HTTP_REFERER</code></td></tr>
+<tr><td><code>HTTP_USER_AGENT</code></td></tr>
</table>
<p>Other request related variables</p>
@@ -160,7 +163,7 @@ listfunction ::= listfuncname "<strong>(
<tr><td><code>REQUEST_URI</code></td>
<td>The path part of the request's URI</td></tr>
<tr class="odd"><td><code>DOCUMENT_URI</code></td>
- <td>Same as REQUEST_URI</td></tr>
+ <td>Same as <code>REQUEST_URI</code></td></tr>
<tr><td><code>REQUEST_FILENAME</code></td>
<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
@@ -249,6 +252,10 @@ listfunction ::= listfuncname "<strong>(
<tr class="odd"><td><code>CONN_REMOTE_ADDR</code></td>
<td>The peer IP address of the connection (see the
<code class="module"><a href="./mod/mod_remoteip.html">mod_remoteip</a></code> module)</td></tr>
+<tr><td><code>CONTEXT_PREFIX</code></td>
+ <td /></tr>
+<tr class="odd"><td><code>CONTEXT_DOCUMENT_ROOT</code></td>
+ <td /></tr>
</table>
<p>Misc variables</p>
Modified: httpd/httpd/trunk/docs/manual/expr.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.xml?rev=1595353&r1=1595352&r2=1595353&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.xml (original)
+++ httpd/httpd/trunk/docs/manual/expr.xml Fri May 16 21:25:10 2014
@@ -70,13 +70,14 @@
href="http://en.wikipedia.org/wiki/Backus%E2%80%93Naur_Form">Backus-Naur
Form</a> (BNF) is a notation technique for context-free grammars,
often used to describe the syntax of languages used in computing.
- In most cases, expressions are used to express boolean values. For
- these, the starting point in the BNF is <code>expr</code>.
+ In most cases, expressions are used to express boolean values.
+ For these, the starting point in the BNF is <code>expr</code>.
However, a few directives like <directive
module="mod_log_debug">LogMessage</directive> accept expressions
that evaluate to a string value. For those, the starting point in
the BNF is <code>string</code>.
</p>
+<blockquote>
<pre>
expr ::= "<strong>true</strong>" | "<strong>false</strong>"
| "<strong>!</strong>" expr
@@ -139,6 +140,7 @@ function ::= funcname "<strong>(</st
listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
</pre>
+</blockquote>
</section>
@@ -166,6 +168,7 @@ listfunction ::= listfuncname "<strong>(
<tr><th>Name</th></tr>
<tr><td><code>HTTP_ACCEPT</code></td></tr>
+ <tr><td><code>HTTP_COOKIE</code></td></tr>
<tr><td><code>HTTP_FORWARDED</code></td></tr>
<tr><td><code>HTTP_HOST</code></td></tr>
<tr><td><code>HTTP_PROXY_CONNECTION</code></td></tr>
@@ -188,7 +191,7 @@ listfunction ::= listfuncname "<strong>(
<tr><td><code>REQUEST_URI</code></td>
<td>The path part of the request's URI</td></tr>
<tr><td><code>DOCUMENT_URI</code></td>
- <td>Same as REQUEST_URI</td></tr>
+ <td>Same as <code>REQUEST_URI</code></td></tr>
<tr><td><code>REQUEST_FILENAME</code></td>
<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
@@ -278,6 +281,10 @@ listfunction ::= listfuncname "<strong>(
<tr><td><code>CONN_REMOTE_ADDR</code></td>
<td>The peer IP address of the connection (see the
<module>mod_remoteip</module> module)</td></tr>
+ <tr><td><code>CONTEXT_PREFIX</code></td>
+ <td></td></tr>
+ <tr><td><code>CONTEXT_DOCUMENT_ROOT</code></td>
+ <td></td></tr>
</table>