From: Daniel Gruno Date: Fri, 27 Apr 2012 10:48:14 +0000 (+0000) Subject: xforms, again X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=637a3a8c46a41d85447d3838837e8778f2da82b6;p=thirdparty%2Fapache%2Fhttpd.git xforms, again git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331347 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_lua.xml.fr b/docs/manual/mod/mod_lua.xml.fr index e8e6fa779fb..14f47d22dbc 100644 --- a/docs/manual/mod/mod_lua.xml.fr +++ b/docs/manual/mod/mod_lua.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_proxy_fcgi.html.en b/docs/manual/mod/mod_proxy_fcgi.html.en index b2f42d8e8fd..f7b33f5003d 100644 --- a/docs/manual/mod/mod_proxy_fcgi.html.en +++ b/docs/manual/mod/mod_proxy_fcgi.html.en @@ -72,7 +72,10 @@ enable mod_proxy and mod_proxy_fcgi.

Single application instance

+ 

       ProxyPass /myapp/ fcgi://localhost:4000/
+
+

This application should be able to handle multiple concurrent @@ -87,7 +90,10 @@ the following example:

Single application instance, no connection reuse

+ 

       ProxyPass /myapp/ fcgi://localhost:4000/ disablereuse=on
+
+

The balanced gateway needs mod_proxy_balancer and @@ -97,13 +103,14 @@ default, and will be used for this example configuration.

Balanced gateway to multiple application instances

- ProxyPass /myapp/ balancer://myappcluster/
- <Proxy balancer://myappcluster/>
- - BalancerMember fcgi://localhost:4000/
- BalancerMember fcgi://localhost:4001/
- - </Proxy> + 

+ProxyPass /myapp/ balancer://myappcluster/
+<Proxy balancer://myappcluster/>
+    BalancerMember fcgi://localhost:4000/
+    BalancerMember fcgi://localhost:4001/
+</Proxy>
+
+

top
diff --git a/docs/manual/mod/mod_proxy_scgi.html.en b/docs/manual/mod/mod_proxy_scgi.html.en index 6db9a42f512..c5adbdb4826 100644 --- a/docs/manual/mod/mod_proxy_scgi.html.en +++ b/docs/manual/mod/mod_proxy_scgi.html.en @@ -68,7 +68,10 @@ enable mod_proxy and mod_proxy_scgi.

Simple gateway

+ 

       ProxyPass /scgi-bin/ scgi://localhost:4000/
+
+

The balanced gateway needs mod_proxy_balancer and @@ -78,13 +81,14 @@ default, and will be used for this example configuration.

Balanced gateway

- ProxyPass /scgi-bin/ balancer://somecluster/
- <Proxy balancer://somecluster/>
- - BalancerMember scgi://localhost:4000/
- BalancerMember scgi://localhost:4001/
- - </Proxy> + 

+ProxyPass /scgi-bin/ balancer://somecluster/
+<Proxy balancer://somecluster/>
+    BalancerMember scgi://localhost:4000/
+    BalancerMember scgi://localhost:4001/
+</Proxy>
+
+

top
@@ -127,7 +131,10 @@ backend feature.

Example

+ 

     ProxySCGIInternalRedirect Off
+
+

@@ -165,11 +172,14 @@ header

Example

- # Use the default header (X-Sendfile)
- ProxySCGISendfile On
-
- # Use a different header
+ 

+    # Use the default header (X-Sendfile)
+    ProxySCGISendfile On
+    
+    # Use a different header
     ProxySCGISendfile X-Send-Static
+
+

diff --git a/docs/manual/mod/mod_ratelimit.html.en b/docs/manual/mod/mod_ratelimit.html.en index 768532bad8e..0557caea98d 100644 --- a/docs/manual/mod/mod_ratelimit.html.en +++ b/docs/manual/mod/mod_ratelimit.html.en @@ -38,12 +38,13 @@ The connection speed to be simulated is specified, in KiB/s, using the environme variable rate-limit.

Example Configuration

-<Location /downloads>
- -SetOutputFilter RATE_LIMIT
-SetEnv rate-limit 400
- +

+<Location /downloads>
+    SetOutputFilter RATE_LIMIT
+    SetEnv rate-limit 400 
 </Location>
+
+

diff --git a/docs/manual/mod/mod_reflector.html.en b/docs/manual/mod/mod_reflector.html.en index b4b1fbae5b1..9ab03657b1c 100644 --- a/docs/manual/mod/mod_reflector.html.en +++ b/docs/manual/mod/mod_reflector.html.en @@ -55,23 +55,25 @@
Pass the request body through the DEFLATE filter to compress the body. This request requires a Content-Encoding request header containing "gzip" for the filter to return compressed data. -

- <Location /compress>
- SetHandler reflector
- SetOutputFilter DEFLATE
- </Location> -

+ 
+<Location /compress>
+    SetHandler reflector
+    SetOutputFilter DEFLATE
+</Location>
+
+
Image downsampling service
Pass the request body through an image downsampling filter, and reflect the results to the caller. -

- <Location /downsample>
- SetHandler reflector
- SetOutputFilter DOWNSAMPLE
- </Location> -

+ 
+<Location /downsample>
+    SetHandler reflector
+    SetOutputFilter DOWNSAMPLE
+</Location>
+
+
diff --git a/docs/manual/mod/mod_reqtimeout.html.en b/docs/manual/mod/mod_reqtimeout.html.en index 706419020bb..ad17b56a2a4 100644 --- a/docs/manual/mod/mod_reqtimeout.html.en +++ b/docs/manual/mod/mod_reqtimeout.html.en @@ -50,9 +50,10 @@ Allow 10 seconds to receive the request including the headers and 30 seconds for receiving the request body: -

+ 

           RequestReadTimeout header=10 body=30
-
+ +
  • @@ -62,9 +63,10 @@ the limit given indirectly by LimitRequestBody): -

    + 

               RequestReadTimeout body=10,MinRate=1000
-
    + +
  • @@ -73,9 +75,10 @@ 500 bytes received. But do not allow more than 30 seconds for the request including the headers: -

    + 

               RequestReadTimeout header=10-30,MinRate=500
-
    + +
  • @@ -83,9 +86,10 @@ If a common configuration is used for http and https virtual hosts, the timeouts should not be set too low: -

    + 

               RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500
-
    + +
    • diff --git a/docs/manual/mod/mod_session.html.en b/docs/manual/mod/mod_session.html.en index fe9187efb3e..740e09dafac 100644 --- a/docs/manual/mod/mod_session.html.en +++ b/docs/manual/mod/mod_session.html.en @@ -160,8 +160,11 @@ stored on the browser, in a cookie called session.

    Browser based session

    - Session On
    - SessionCookieName session path=/
    + 

    +Session On
+SessionCookieName session path=/
+
    +

    The session is not useful unless it can be written to or read from. The @@ -170,9 +173,12 @@ X-Replace-Session.

    Writing to a session

    - Session On
    - SessionCookieName session path=/
    - SessionHeader X-Replace-Session
    + 

    +Session On
+SessionCookieName session path=/
+SessionHeader X-Replace-Session
+
    +

    The header should contain name value pairs expressed in the same format @@ -180,11 +186,14 @@ empty string has the effect of removing that key from the session.

    CGI to write to a session

    - #!/bin/bash
    - echo "Content-Type: text/plain"
    - echo "X-Replace-Session: key1=foo&key2=&key3=bar"
    - echo
    - env
    + 

    +#!/bin/bash
+echo "Content-Type: text/plain"
+echo "X-Replace-Session: key1=foo&key2=&key3=bar"
+echo
+env
+
    +

    If configured, the session can be read back from the HTTP_SESSION @@ -193,10 +202,13 @@ SessionEnv directive.

    Read from a session

    - Session On
    - SessionEnv On
    - SessionCookieName session path=/
    - SessionHeader X-Replace-Session
    + 

    +Session On
+SessionEnv On
+SessionCookieName session path=/
+SessionHeader X-Replace-Session
+
    +

    Once read, the CGI variable HTTP_SESSION should contain @@ -217,9 +229,12 @@ module.

    Browser based encrypted session

    - Session On
    - SessionCryptoPassphrase secret
    - SessionCookieName session path=/
    + 

    +Session On
+SessionCryptoPassphrase secret
+SessionCookieName session path=/
+
    +

    The session will be automatically decrypted on load, and encrypted on @@ -254,9 +269,12 @@ as in the example below.

    Setting cookie parameters

    - Session On
    - SessionCryptoPassphrase secret
    - SessionCookieName session path=/private;domain=example.com;httponly;secure;
    + 

    +Session On
+SessionCryptoPassphrase secret
+SessionCookieName session path=/private;domain=example.com;httponly;secure;
+
    +

    In cases where the Apache server forms the frontend for backend origin servers, @@ -276,14 +294,17 @@ the session.

    Form based authentication

    - Session On
    - SessionCryptoPassphrase secret
    - SessionCookieName session path=/
    - AuthFormProvider file
    - AuthUserFile conf/passwd
    - AuthType form
    - AuthName realm
    - ...
    + 

    +Session On
+SessionCryptoPassphrase secret
+SessionCookieName session path=/
+AuthFormProvider file
+AuthUserFile conf/passwd
+AuthType form
+AuthName realm
+#...
+
    +

    See the mod_auth_form module for documentation and complete diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index 01145802766..ff8d0199073 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -240,7 +240,7 @@ For backward compatibility there is additionally a special ``%{name}c'' cryptography format function provided. Information about this function is provided in the Compatibility chapter.

    Example

    -

     
+
     CustomLog logs/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 
    
 
diff --git a/docs/manual/mod/mod_substitute.html.en b/docs/manual/mod/mod_substitute.html.en
index 7e1e70a148e..0e339590e32 100644
--- a/docs/manual/mod/mod_substitute.html.en
+++ b/docs/manual/mod/mod_substitute.html.en
@@ -80,36 +80,39 @@
     
 
     
    Example
    
-        <Location />
-        
-            AddOutputFilterByType SUBSTITUTE text/html
    
-            Substitute s/foo/bar/ni
    
-            
-        </Location>
+    
    +<Location />
+    AddOutputFilterByType SUBSTITUTE text/html
+    Substitute s/foo/bar/ni
+</Location>
+        
    
+
     
    
 
     
    If either the pattern or the substitution contain a slash
     character then an alternative delimiter should be used:
    
 
     
    Example of using an alternate delimiter
    
-        <Location />
-        
-            AddOutputFilterByType SUBSTITUTE text/html
    
-            Substitute "s|<BR */?>|<br />|i"
-            
-        </Location>
+    
    +<Location />
+    AddOutputFilterByType SUBSTITUTE text/html
+    Substitute "s|<BR */?>|<br />|i"
+</Location>
+        
    
+
     
    
 
     
    Backreferences can be used in the comparison and in the substitution,
     when regular expressions are used, as illustrated in the following example: 
    
     
    Example of using backreferences and captures
    
-        <Location />
-        
-            AddOutputFilterByType SUBSTITUTE text/html
    
-            # "foo=k,bar=k" -> "foo/bar=k" 
    
-            Substitute "s|foo=(\w+),bar=\1|foo/bar=$1"
-            
-        </Location>
+    
    +<Location />
+    AddOutputFilterByType SUBSTITUTE text/html
+    # "foo=k,bar=k" -> "foo/bar=k" 
+    Substitute "s|foo=(\w+),bar=\1|foo/bar=$1"
+</Location>
+    
    
+
     
    
 
     
    A common use scenario for mod_substitute is the
@@ -122,10 +125,13 @@
     those URLs into something that will work from the front end:
    
 
     
    Rewriting URLs embedded in proxied content
    
-    ProxyPass /blog/ http://internal.blog.example.com
    
-    ProxyPassReverse /blog/ http://internal.blog.example.com/
    
-    
    
-    Substitute "s|http://internal.blog.example.com/|http://www.example.com/blog/|i"
+    
    +ProxyPass /blog/ http://internal.blog.example.com
+ProxyPassReverse /blog/ http://internal.blog.example.com/
+
+Substitute "s|http://internal.blog.example.com/|http://www.example.com/blog/|i"
+    
    
+
     
    
 
     
    ProxyPassReverse
diff --git a/docs/manual/mod/mod_usertrack.html.en b/docs/manual/mod/mod_usertrack.html.en
index 0df2836e17d..d09f475ee9d 100644
--- a/docs/manual/mod/mod_usertrack.html.en
+++ b/docs/manual/mod/mod_usertrack.html.en
@@ -57,10 +57,11 @@
     
    mod_usertrack sets a cookie which can be logged
     via mod_log_config configurable logging formats:
    
 
-    
    
-    LogFormat "%{Apache}n %r %t" usertrack
    
-    CustomLog logs/clickstream.log usertrack
-    
    
+    
    +LogFormat "%{Apache}n %r %t" usertrack
+CustomLog logs/clickstream.log usertrack
+    
    
+
    top
    @@ -95,9 +96,10 @@ level domain (for example .example.co.uk). -

    + 

         CookieDomain .example.com
-
    + +
    top
    @@ -121,9 +123,10 @@

    If this directive is not used, cookies last only for the current browser session.

    -

    + 

         CookieExpires "3 weeks"
-
    + +
    top
    @@ -145,9 +148,10 @@ unpredictable if you use a name containing unusual characters. Valid characters include A-Z, a-z, 0-9, "_", and "-".

    -

    + 

         CookieName clicktrack
-
    + +
    top
    @@ -183,9 +187,10 @@ three of these formats, with Cookie2 being the preferred format.

    -

    + 

         CookieStyle Cookie2
-
    + +
    top
    @@ -207,9 +212,10 @@ mod_usertrack will not activate cookies.

    -

    + 

         CookieTracking on
-
    + + diff --git a/docs/manual/mod/mod_vhost_alias.html.en b/docs/manual/mod/mod_vhost_alias.html.en index 31d69cc6261..52fc307e6b9 100644 --- a/docs/manual/mod/mod_vhost_alias.html.en +++ b/docs/manual/mod/mod_vhost_alias.html.en @@ -48,10 +48,11 @@ hosting /cgi-bin/script.pl     to /usr/local/apache2/cgi-bin/script.pl in all cases:

    -

    - ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
    - VirtualScriptAlias /never/found/%0/cgi-bin/ -

    + 
    +ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
+VirtualScriptAlias /never/found/%0/cgi-bin/
+
    +

    Directives

    @@ -143,10 +144,11 @@ hosting

    For simple name-based virtual hosts you might use the following directives in your server configuration file:

    -

    - UseCanonicalName Off
    - VirtualDocumentRoot /usr/local/apache/vhosts/%0 -

    + 
    +UseCanonicalName    Off
+VirtualDocumentRoot /usr/local/apache/vhosts/%0
+
    +

    A request for http://www.example.com/directory/file.html will be @@ -159,10 +161,11 @@ hosting vhosts directory. To do this you might use the following in your configuration file:

    -

    - UseCanonicalName Off
    - VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2 -

    + 
    +UseCanonicalName    Off
+VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2
+
    +

    A request for http://www.domain.example.com/directory/file.html @@ -172,18 +175,20 @@ hosting

    A more even spread of files can be achieved by hashing from the end of the name, for example:

    -

    +

         VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2
-
    + +

    The example request would come from /usr/local/apache/vhosts/example.com/n/i/a/domain/directory/file.html.

    Alternatively you might use:

    -

    +

         VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+
-
    + +

    The example request would come from /usr/local/apache/vhosts/example.com/d/o/m/ain/directory/file.html.

    @@ -191,11 +196,12 @@ hosting

    For IP-based virtual hosting you might use the following in your configuration file:

    -

    - UseCanonicalName DNS
    - VirtualDocumentRootIP /usr/local/apache/vhosts/%1/%2/%3/%4/docs
    - VirtualScriptAliasIP /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin -

    + 
    +UseCanonicalName DNS
+VirtualDocumentRootIP /usr/local/apache/vhosts/%1/%2/%3/%4/docs
+VirtualScriptAliasIP  /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin
+
    +

    A request for http://www.domain.example.com/directory/file.html @@ -212,9 +218,10 @@ hosting a % directive, you can work around the problem in the following way:

    -

    +

         VirtualDocumentRoot /usr/local/apache/vhosts/%2.0.%3.0
-
    + +

    A request for http://www.domain.example.com/directory/file.html diff --git a/docs/manual/mod/mod_xml2enc.html.en b/docs/manual/mod/mod_xml2enc.html.en index 8ba9cbd72ae..872e1394f69 100644 --- a/docs/manual/mod/mod_xml2enc.html.en +++ b/docs/manual/mod/mod_xml2enc.html.en @@ -165,7 +165,8 @@ module for earlier versions. information, you can set this default to help mod_xml2enc process the data correctly. For example, to work with the default value of Latin1 (iso-8859-1 specified in HTTP/1.0, use

    -

    xml2EncDefault iso-8859-1

    + 
    xml2EncDefault iso-8859-1
    +
    top