From 799c4a11e87a07c6a00d6d7a0be11d1b9717afee Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Fri, 16 May 2014 21:25:10 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1595353 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/expr.html.en | 23 +++++++++++++++-------- docs/manual/expr.xml | 13 ++++++++++--- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en index f5d2de01ca..ad5e29875d 100644 --- a/docs/manual/expr.html.en +++ b/docs/manual/expr.html.en @@ -52,12 +52,13 @@

Backus-Naur Form (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 expr. + In most cases, expressions are used to express boolean values. + For these, the starting point in the BNF is expr. However, a few directives like LogMessage accept expressions that evaluate to a string value. For those, the starting point in the BNF is string.

+
expr        ::= "true" | "false"
               | "!" expr
               | expr "&&" expr
@@ -118,6 +119,7 @@ rebackref   ::= "$" [0-9]
 function     ::= funcname "(" word ")"
 
 listfunction ::= listfuncname "(" word ")"
+
top
@@ -142,11 +144,12 @@ listfunction ::= listfuncname "(" word ")"Name HTTP_ACCEPT -HTTP_FORWARDED -HTTP_HOST -HTTP_PROXY_CONNECTION -HTTP_REFERER -HTTP_USER_AGENT +HTTP_COOKIE +HTTP_FORWARDED +HTTP_HOST +HTTP_PROXY_CONNECTION +HTTP_REFERER +HTTP_USER_AGENT

Other request related variables

@@ -160,7 +163,7 @@ listfunction ::= listfuncname "(" word ")"REQUEST_URI The path part of the request's URI DOCUMENT_URI - Same as REQUEST_URI + Same as REQUEST_URI REQUEST_FILENAME 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 "(" word ")"CONN_REMOTE_ADDR The peer IP address of the connection (see the mod_remoteip module) +CONTEXT_PREFIX + +CONTEXT_DOCUMENT_ROOT +

Misc variables

diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml index ba5b2b7af1..5875dc5f2a 100644 --- a/docs/manual/expr.xml +++ b/docs/manual/expr.xml @@ -70,13 +70,14 @@ href="http://en.wikipedia.org/wiki/Backus%E2%80%93Naur_Form">Backus-Naur Form (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 expr. + In most cases, expressions are used to express boolean values. + For these, the starting point in the BNF is expr. However, a few directives like LogMessage accept expressions that evaluate to a string value. For those, the starting point in the BNF is string.

+
 expr        ::= "true" | "false"
               | "!" expr
@@ -139,6 +140,7 @@ function     ::= funcname "(" word ")"
 
 listfunction ::= listfuncname "(" word ")"
+
@@ -166,6 +168,7 @@ listfunction ::= listfuncname "(" word ")" Name HTTP_ACCEPT + HTTP_COOKIE HTTP_FORWARDED HTTP_HOST HTTP_PROXY_CONNECTION @@ -188,7 +191,7 @@ listfunction ::= listfuncname "(" word ")" REQUEST_URI The path part of the request's URI DOCUMENT_URI - Same as REQUEST_URI + Same as REQUEST_URI REQUEST_FILENAME 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 "(" word ")" CONN_REMOTE_ADDR The peer IP address of the connection (see the mod_remoteip module) + CONTEXT_PREFIX + + CONTEXT_DOCUMENT_ROOT + -- 2.40.0