From 24c0db644e91080440159a5a30f80a52ec7b9c0a Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Sun, 7 Nov 2010 22:55:58 +0000 Subject: [PATCH] Update transformations git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032414 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/expr.html.en | 25 ++++++--- docs/manual/mod/index.html.de | 2 +- docs/manual/mod/index.html.es | 2 +- docs/manual/mod/index.html.fr | 7 +-- docs/manual/mod/index.html.ko.euc-kr | 2 +- docs/manual/mod/index.html.tr.utf8 | 2 +- docs/manual/mod/mod_filter.html.en | 82 +++++++--------------------- docs/manual/suexec.html.fr | 4 +- docs/manual/suexec.xml.meta | 2 +- docs/manual/upgrading.html.en | 4 ++ docs/manual/upgrading.html.fr | 2 + docs/manual/upgrading.xml.fr | 2 +- docs/manual/upgrading.xml.meta | 2 +- 13 files changed, 54 insertions(+), 84 deletions(-) diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en index d8fd3af885..833fb3f1f8 100644 --- a/docs/manual/expr.html.en +++ b/docs/manual/expr.html.en @@ -157,11 +157,13 @@ listfunction ::= listfuncname "(" word ")" CONTENT_TYPE -REMOTE_ADDR +HANDLER -HTTPS +REMOTE_ADDR -IPV6 +HTTPS + +IPV6 @@ -250,9 +252,9 @@ listfunction ::= listfuncname "(" word ")" - + - +
NameDescription
-nString is not empty (XXX: not yet implemented)
String is not empty
-zString is empty (XXX: not yet implemented)
String is empty
top
@@ -269,11 +271,16 @@ listfunction ::= listfuncname "(" word ")" Get HTTP request header resp Get HTTP response header -osenv +reqenv + Lookup request environment variable +osenv Lookup operating system environment variable +note + Lookup request environment variable env - Lookup request environment variable (XXX: will need to be changed for better ssl_expr compat) -lolower + Reqturn first match of note, reqenv, + osenv +tolower Convert string to lower case toupper Convert string to uppser case @@ -281,6 +288,8 @@ listfunction ::= listfuncname "(" word ")" Escape special characters in %hex encoding unescape Unescape %hex encoded string, leaving URL-special characters encoded (XXX: describe better) +file + Read contents from a file

In addition to string-valued functions, there are also list-valued functions which diff --git a/docs/manual/mod/index.html.de b/docs/manual/mod/index.html.de index a0242e044f..d9fbfec21a 100644 --- a/docs/manual/mod/index.html.de +++ b/docs/manual/mod/index.html.de @@ -165,7 +165,7 @@ request processing

mod_nw_ssl
Enable SSL encryption for NetWare
mod_privileges
Support for Solaris privileges and for running virtual hosts under different user IDs.
-
mod_proxy
HTTP/1.1 proxy/gateway server
+
mod_proxy
Multi-protocol proxy/gateway server
mod_proxy_ajp
AJP support module for mod_proxy
mod_proxy_balancer
mod_proxy extension for load balancing
diff --git a/docs/manual/mod/index.html.es b/docs/manual/mod/index.html.es index 552861dffb..929b0c42d0 100644 --- a/docs/manual/mod/index.html.es +++ b/docs/manual/mod/index.html.es @@ -167,7 +167,7 @@ request processing
mod_nw_ssl
Enable SSL encryption for NetWare
mod_privileges
Support for Solaris privileges and for running virtual hosts under different user IDs.
-
mod_proxy
HTTP/1.1 proxy/gateway server
+
mod_proxy
Multi-protocol proxy/gateway server
mod_proxy_ajp
AJP support module for mod_proxy
mod_proxy_balancer
mod_proxy extension for load balancing
diff --git a/docs/manual/mod/index.html.fr b/docs/manual/mod/index.html.fr index 1e4c2a73d7..ce4c47c663 100644 --- a/docs/manual/mod/index.html.fr +++ b/docs/manual/mod/index.html.fr @@ -100,8 +100,7 @@ fichiers manière similaire à la commande Unix ls, ou à la commande shell Win32 dir
mod_buffer
Support de la mise en tampon des requêtes
-
mod_cache
Mise en cache de contenu référencé par un -URI.
+
mod_cache
Filtre de mise en cache HTTP conforme à la RFC 2616
mod_cern_meta
CERN httpd metafile semantics
mod_cgi
Execution of CGI scripts
mod_cgid
Execution of CGI scripts using an @@ -118,8 +117,8 @@ client
mod_dir
Permet la redirection des adresses se terminant par un répertoire sans slash de fin et la mise à disposition des fichiers index de répertoire
-
mod_disk_cache
Gestionnaire de stockage du cache de contenu à base -d'URIs
+
mod_disk_cache
Module de stockage sur disque pour le filtre de mise en +cache HTTP.
mod_dumpio
Dumps all I/O to error log as desired.
mod_echo
Un simple serveur d'écho pour illustrer les modules de protocole
diff --git a/docs/manual/mod/index.html.ko.euc-kr b/docs/manual/mod/index.html.ko.euc-kr index e914caae7e..4cc277c65a 100644 --- a/docs/manual/mod/index.html.ko.euc-kr +++ b/docs/manual/mod/index.html.ko.euc-kr @@ -150,7 +150,7 @@ request processing
mod_nw_ssl
Enable SSL encryption for NetWare
mod_privileges
Support for Solaris privileges and for running virtual hosts under different user IDs.
-
mod_proxy
HTTP/1.1 proxy/gateway server
+
mod_proxy
Multi-protocol proxy/gateway server
mod_proxy_ajp
AJP support module for mod_proxy
mod_proxy_balancer
mod_proxy extension for load balancing
diff --git a/docs/manual/mod/index.html.tr.utf8 b/docs/manual/mod/index.html.tr.utf8 index adc5b62e47..9b3989e2e8 100644 --- a/docs/manual/mod/index.html.tr.utf8 +++ b/docs/manual/mod/index.html.tr.utf8 @@ -158,7 +158,7 @@ request processing
mod_nw_ssl
Enable SSL encryption for NetWare
mod_privileges
Support for Solaris privileges and for running virtual hosts under different user IDs.
-
mod_proxy
HTTP/1.1 proxy/gateway server
+
mod_proxy
Multi-protocol proxy/gateway server
mod_proxy_ajp
AJP support module for mod_proxy
mod_proxy_balancer
mod_proxy extension for load balancing
diff --git a/docs/manual/mod/mod_filter.html.en b/docs/manual/mod/mod_filter.html.en index 0a827302bc..ff7227773e 100644 --- a/docs/manual/mod/mod_filter.html.en +++ b/docs/manual/mod/mod_filter.html.en @@ -134,7 +134,8 @@ headers, environment variables, or the Handler used by this request. Unlike earlier versions, mod_filter now supports complex expressions involving multiple criteria with AND / OR logic (&& / ||) - and brackets. + and brackets. The details of the expression syntax are described in + the ap_expr documentation.
Configure the Chain
The above directives build components of a smart filter chain, @@ -160,15 +161,14 @@ more versatile expression. In general, you can convert a match/dispatch pair to the two sides of an expression, using something like:

-

"dispatch = match"

+

"dispatch = 'match'"

The Request headers, Response headers and Environment variables - are now interpreted from syntax $req{foo}, - $resp{foo} and $env{foo} respectively. - The variables $handler and $Content-Type + are now interpreted from syntax %{req:foo}, + %{resp:foo} and %{env:foo} respectively. + The variables %{HANDLER} and %{CONTENT_TYPE} are also supported.

-

Note that the match no longer supports integer comparisons - or substring matches. The latter can be replaced by regular - expression matches.

+

Note that the match no longer support substring matches. They can be + replaced by regular expression matches.

top

Examples

@@ -177,7 +177,7 @@
A simple case of replacing AddOutputFilterByType

FilterDeclare SSI
- FilterProvider SSI INCLUDES "$resp{Content-Type} = /^text\/html/"
+ FilterProvider SSI INCLUDES "%{CONTENT_TYPE} =~ m|^text/html|"
FilterChain SSI

@@ -186,7 +186,7 @@
The same as the above but dispatching on handler (classic SSI behaviour; .shtml files get processed).

- FilterProvider SSI INCLUDES "Handler = server-parsed"
+ FilterProvider SSI INCLUDES "%{HANDLER} = 'server-parsed'"
FilterChain SSI

@@ -196,7 +196,7 @@ Accept-Encoding header. This filter runs with ftype CONTENT_SET.

FilterDeclare gzip CONTENT_SET
- FilterProvider gzip inflate "$req{Accept-Encoding} != /gzip/"
+ FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip/"
FilterChain gzip

@@ -205,16 +205,16 @@
Suppose we want to downsample all web images, and have filters for GIF, JPEG and PNG.

- FilterProvider unpack jpeg_unpack "$resp{Content-Type} = image/jpeg"
- FilterProvider unpack gif_unpack "$resp{Content-Type} = image/gif"
- FilterProvider unpack png_unpack "$resp{Content-Type} = image/png"
+ FilterProvider unpack jpeg_unpack "%{CONTENT_TYPE} = 'image/jpeg'"
+ FilterProvider unpack gif_unpack "%{CONTENT_TYPE} = 'image/gif'"
+ FilterProvider unpack png_unpack "%{CONTENT_TYPE} = 'image/png'"

- FilterProvider downsample downsample_filter "$resp{Content-Type} = /image\/(jpeg|gif|png)/"
+ FilterProvider downsample downsample_filter "%{CONTENT_TYPE} = m|^image/(jpeg|gif|png)|"
FilterProtocol downsample "change=yes"

- FilterProvider repack jpeg_pack "$resp{Content-Type} = image/jpeg"
- FilterProvider repack gif_pack "$resp{Content-Type} = image/gif"
- FilterProvider repack png_pack "$resp{Content-Type} = image/png"
+ FilterProvider repack jpeg_pack "%{CONTENT_TYPE} = 'image/jpeg'"
+ FilterProvider repack gif_pack "%{CONTENT_TYPE} = 'image/gif'"
+ FilterProvider repack png_pack "%{CONTENT_TYPE} = 'image/png'"
<Location /image-filter>
FilterChain unpack downsample repack
@@ -460,50 +460,8 @@ ap_register_output_filter.

-

expression can be any of the following:

-
-
string
-
true if string is not empty
- -
string1 = string2
- string1 == string2
- string1 != string2
- -

Compare string1 with string2. If - string2 has the form /string2/ - then it is treated as a regular expression. Regular expressions are - implemented by the PCRE engine and - have the same syntax as those in perl - 5. Note that == is just an alias for = - and behaves exactly the same way.

-
- -
string1 < string2
- string1 <= string2
- string1 > string2
- string1 >= string2
- -
Compare string1 with string2. Note, that - strings are compared literally (using - strcmp(3)). Therefore the string "100" is less than - "20".
- -
( expression )
-
true if expression is true
- -
! expression
-
true if expression is false
- -
expression1 && - expression2
-
true if both expression1 and - expression2 are true
- -
expression1 || - expression2
-
true if either expression1 or - expression2 is true
-
+

expression is described in the + ap_expr documentation.

diff --git a/docs/manual/suexec.html.fr b/docs/manual/suexec.html.fr index 91b98ffb68..18ab4ae0a4 100644 --- a/docs/manual/suexec.html.fr +++ b/docs/manual/suexec.html.fr @@ -24,8 +24,6 @@  ko  |  tr 

-
Cette traduction peut être périmée. Vérifiez la version - anglaise pour les changements récents.

La fonctionnalité suEXEC permet l'exécution des programmes CGI et @@ -400,7 +398,7 @@ de suEXEC

L'utilisateur sous lequel httpd s'exécute habituellement. C'est le seul utilisateur - autorisé à utiliser suexec.
+ autorisé à exécuter le wrapper suEXEC.
--with-suexec-userdir=DIR
diff --git a/docs/manual/suexec.xml.meta b/docs/manual/suexec.xml.meta index f1be9d6399..ce2ceefd2d 100644 --- a/docs/manual/suexec.xml.meta +++ b/docs/manual/suexec.xml.meta @@ -8,7 +8,7 @@ en - fr + fr ja ko tr diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en index f2c8aed096..140de59570 100644 --- a/docs/manual/upgrading.html.en +++ b/docs/manual/upgrading.html.en @@ -211,6 +211,10 @@ directive, review your configuration to make sure it is present in all the necessary directory contexts. +
  • mod_filter: FilterProvider syntax has changed and + now uses a boolean expression to determine if a filter is applied. +
    • +
    top
    diff --git a/docs/manual/upgrading.html.fr b/docs/manual/upgrading.html.fr index 11ec9a0873..3face72ac7 100644 --- a/docs/manual/upgrading.html.fr +++ b/docs/manual/upgrading.html.fr @@ -21,6 +21,8 @@

    Langues Disponibles:  en  |  fr 

    +
    Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

    Afin d'assister les utilisateurs lors de leurs opérations de mise à jour, nous maintenons un document diff --git a/docs/manual/upgrading.xml.fr b/docs/manual/upgrading.xml.fr index b7492a9c60..463da64e64 100644 --- a/docs/manual/upgrading.xml.fr +++ b/docs/manual/upgrading.xml.fr @@ -3,7 +3,7 @@ - +