From: Andre Malo Date: Fri, 24 Jan 2014 08:18:03 +0000 (+0000) Subject: rewrap for readability X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cfdc4be6befec0a65e58003d0510015d4e36d0a;p=thirdparty%2Fapache%2Fhttpd.git rewrap for readability git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560914 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml index 2fa607915fa..698b3f1dae2 100644 --- a/docs/manual/expr.xml +++ b/docs/manual/expr.xml @@ -25,17 +25,16 @@ Expressions in Apache HTTP Server -

Historically, there are several syntax variants for expressions used to express - a condition in the different modules of the Apache HTTP Server. - There is some ongoing effort to only use a single variant, called ap_expr, - for all configuration directives. - This document describes the ap_expr expression parser. +

Historically, there are several syntax variants for expressions + used to express a condition in the different modules of the Apache + HTTP Server. There is some ongoing effort to only use a single + variant, called ap_expr, for all configuration directives. + This document describes the ap_expr expression parser.

The ap_expr expression is intended to replace most other - expression variants in HTTPD. For example, the deprecated - SSLRequire expressions can be - replaced by Require expr. -

+ expression variants in HTTPD. For example, the deprecated SSLRequire expressions can be replaced + by Require expr.

If @@ -66,12 +65,16 @@
Grammar in Backus-Naur Form notation -

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. However, a few directives - like LogMessage accept expressions - that evaluate to a string value. For those, the starting point in the BNF is string. +

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. + However, a few directives like LogMessage accept expressions + that evaluate to a string value. For those, the starting point in + the BNF is string. 

@@ -251,8 +254,9 @@ listfunction ::= listfuncname "(" word ")"
         The DocumentRoot of
             the current vhost
     AUTH_TYPE
-        The configured AuthType
-            (e.g. "basic")
+        The configured AuthType (e.g.
+        "basic")
     CONTENT_TYPE
         The content type of the response
     HANDLER
@@ -301,14 +305,16 @@ listfunction ::= listfuncname "(" word ")"
         The day of the week (starting with 0
             for Sunday)
     TIME
-        The date and time in the format 20101231235959
+        The date and time in the format
+        20101231235959
     SERVER_SOFTWARE
         The server version string
     API_VERSION
         The date of the API version (module magic number)
     
 
-    
Some modules register additional variables, see e.g. mod_ssl.

+    
Some modules register additional variables, see e.g.
+    mod_ssl.
@@ -440,7 +446,8 @@ listfunction ::= listfuncname "(" word ")" "false", or "no" (case insensitive). True otherwise. -R - Same as "%{REMOTE_ADDR} -ipmatch ...", but more efficient + Same as "%{REMOTE_ADDR} -ipmatch ...", but more + efficient @@ -468,7 +475,9 @@ listfunction ::= listfuncname "(" word ")" resp Get HTTP response header reqenv - Lookup request environment variable (as a shortcut, v can be used too to access variables). + Lookup request environment variable (as a shortcut, + v can be used too to access + variables). osenv Lookup operating system environment variable note @@ -513,11 +522,11 @@ listfunction ::= listfuncname "(" word ")" the expression. The req_novary function can be used to prevent names from being added to the Vary header.

-

In addition to string-valued functions, there are also list-valued functions which - take one string as argument and return a wordlist, i.e. a list of strings. The wordlist - can be used with the special -in operator. - Functions names are not case sensitive. - Modules may register additional functions.

+

In addition to string-valued functions, there are also + list-valued functions which take one string as argument and return a + wordlist, i.e. a list of strings. The wordlist can be used with the + special -in operator. Functions names are not case + sensitive. Modules may register additional functions.

There are no built-in list-valued functions. mod_ssl provides PeerExtList. See the description of @@ -530,7 +539,9 @@ listfunction ::= listfuncname "(" word ")"

Example expressions -

The following examples show how expressions might be used to evaluate requests:

+

The following examples show how expressions might be used to + evaluate requests:

+ # Compare the host name to example.com and redirect to www.example.com if it matches @@ -562,7 +573,8 @@ listfunction ::= listfuncname "(" word ")" string contained in string list /regexp/ m#regexp# - Regular expression (the second form allows different delimiters than /) + Regular expression (the second form allows different + delimiters than /) /regexp/i m#regexp#i Case insensitive regular expression