From cabae8de6aba546e33253956e8a121ffca64c1e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Wed, 29 Jan 2014 13:28:10 +0000 Subject: [PATCH] - apply various table and formatting fixes, which halted the pdflatex run - also add mod_filter_old.png (converted from .gif), required for inclusion in latex git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562436 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/developer/API.xml | 1 - docs/manual/expr.xml | 67 +++++++++++++++----------- docs/manual/images/mod_filter_old.png | Bin 0 -> 738 bytes docs/manual/mod/mod_alias.xml | 4 +- docs/manual/mod/mod_proxy_ajp.xml | 16 +++--- docs/manual/mod/mod_remoteip.xml | 4 +- 6 files changed, 54 insertions(+), 38 deletions(-) create mode 100644 docs/manual/images/mod_filter_old.png diff --git a/docs/manual/developer/API.xml b/docs/manual/developer/API.xml index ab9c5dd7072..45cd728b99c 100644 --- a/docs/manual/developer/API.xml +++ b/docs/manual/developer/API.xml @@ -387,7 +387,6 @@ int method_number; /* M_GET, M_POST, etc. */ 
void *per_dir_config;   /* Options set in config files, etc. */
 void *request_config;   /* Notes on *this* request */
-
}; diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml index fcd1ea12804..0d5a29cb00a 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. +

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. + 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. 

@@ -238,8 +241,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
@@ -288,14 +292,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.
@@ -427,7 +433,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 @@ -443,7 +450,7 @@ listfunction ::= listfuncname "(" word ")" Modules may register additional functions.

- + @@ -455,7 +462,9 @@ listfunction ::= listfuncname "(" word ")" - + @@ -500,11 +509,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 @@ -517,7 +526,8 @@ 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 @@ -549,7 +559,8 @@ listfunction ::= listfuncname "(" word ")"
- + diff --git a/docs/manual/images/mod_filter_old.png b/docs/manual/images/mod_filter_old.png new file mode 100644 index 0000000000000000000000000000000000000000..56c02d834e98d36d4321e9fca13e13f57ce56de3 GIT binary patch literal 738 zc-rd>@N?(olHy`uVBq!ia0vp^3m6y}%@~=1tUI3EEkKGT-O<;Pfnj4m_n$;oAYUQb zBgmJ5p-PQ`p#doW3n~bp9zgaRPZ!6Kh{JDZ?9Dr5AaML`jftezBcoCWm8k;N=51YVoXhN- z+wB;V+1ofmm-1g?KgsZ(QHwcwSL&kD29vUyiA;ISnmZZi*WLJMJ$?6N(Ux<^uLvy6 zd#vOd+fo(vq{61eRU#e1p)Fns2f^&s!wVdbQ7*I`21M z+rqTg;`;}^1S>VazDfJKUTa;DzQ^2WmtztboyxjaIey8mmf3Tg@BAH?dTXgSSJK|F z@W>qVYmR)|DffG)mSreA9hghx<)(P<5p67Ax1 zPUY;fVWKTxGM3m!ubFev`4XGPmcM0xZ%N)Sny_Q-u9rRe6*uC8c9d0Ebfi^f{&4x8 zl323j-|wqhGM0BNg}W24ZSEG}k(EgKP}-o+S93JM=s+g3n#7E*giD8BuKjg;qBhHh zln0NPP7CPW2)boH-*Khyl46r)U?Na0ag8Ve8kTC6T$Bo=7>o=IO>_+mb&U)|49%?! z46F={wG9k`j7M(Q#Zffm=BH$)Rf04a>Vl9-h@r8Sfr*u=IYh(5(??Z+8W=oX{an^L HB{Ts5*Fh(i literal 0 Hc-jL100001 diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml index 326f594d27b..53088cba4d9 100644 --- a/docs/manual/mod/mod_alias.xml +++ b/docs/manual/mod/mod_alias.xml @@ -125,7 +125,9 @@ Alias /foo /gaq URL-path then the server will require a trailing / in order to expand the alias. That is, if you use

-
Alias /icons/ /usr/local/apache/icons/
+ + Alias /icons/ /usr/local/apache/icons/ +

then the url /icons will not be aliased, as it lacks that trailing /. Likewise, if you omit the slash on the diff --git a/docs/manual/mod/mod_proxy_ajp.xml b/docs/manual/mod/mod_proxy_ajp.xml index 4665761ad49..d39bd1293a0 100644 --- a/docs/manual/mod/mod_proxy_ajp.xml +++ b/docs/manual/mod/mod_proxy_ajp.xml @@ -194,11 +194,12 @@ ProxyPassReverse /apps/foo http://www.example.com/foo suggest that the maximum payload could be as large as 2^16, in fact, the code sets the maximum to be 8K.

NameDescriptionRestricted
req, http
resp Get HTTP response header
reqenvLookup 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 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
+ - + - + @@ -206,7 +207,7 @@ ProxyPassReverse /apps/foo http://www.example.com/foo - + @@ -214,11 +215,12 @@ ProxyPassReverse /apps/foo http://www.example.com/foo
Packet Format (Server->Container)Packet Format (Server->Container)
ByteByte 0 1 24...(n+3)
ContentsContents 0x12 0x34 Data Length (n)
+ - + - + @@ -226,7 +228,7 @@ ProxyPassReverse /apps/foo http://www.example.com/foo - + @@ -241,6 +243,7 @@ ProxyPassReverse /apps/foo http://www.example.com/foo

The web server can send the following messages to the servlet container:

Packet Format (Container->Server)Packet Format (Container->Server)
ByteByte 0 1 24...(n+3)
ContentsContents A B Data Length (n)
+ @@ -282,6 +285,7 @@ ProxyPassReverse /apps/foo http://www.example.com/foo

The servlet container can send the following types of messages to the webserver:

Code Type of Packet
+ diff --git a/docs/manual/mod/mod_remoteip.xml b/docs/manual/mod/mod_remoteip.xml index bb764d33eb6..02f680cb41f 100644 --- a/docs/manual/mod/mod_remoteip.xml +++ b/docs/manual/mod/mod_remoteip.xml @@ -178,11 +178,11 @@ RemoteIPInternalProxyList conf/trusted-proxies.lst conf/trusted-proxies.lst contents - 
+    
 # Our internally trusted proxies;
 10.0.2.0/24         #Everyone in the testing group
 gateway.localdomain #The front end balancer
-         

+
 -- 2.47.3
Code Type of Packet