From: Andre Malo Date: Sun, 18 May 2014 21:12:01 +0000 (+0000) Subject: fix transformation (dumpio.fr is not there (yet?)) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c243d06917e5be242a73343abb122edb12f9995;p=thirdparty%2Fapache%2Fhttpd.git fix transformation (dumpio.fr is not there (yet?)) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1595686 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/allmodules.xml.fr b/docs/manual/mod/allmodules.xml.fr index 2ecfcbafeb7..9a8827e881e 100644 --- a/docs/manual/mod/allmodules.xml.fr +++ b/docs/manual/mod/allmodules.xml.fr @@ -44,7 +44,7 @@ mod_deflate.xml.fr mod_dialup.xml.fr mod_dir.xml.fr - mod_dumpio.xml.fr + mod_dumpio.xml mod_echo.xml.fr mod_env.xml.fr mod_example.xml.fr diff --git a/docs/manual/mod/index.html.fr b/docs/manual/mod/index.html.fr index 69d608565c2..d99957f5675 100644 --- a/docs/manual/mod/index.html.fr +++ b/docs/manual/mod/index.html.fr @@ -136,8 +136,7 @@ d
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_dumpio
Enregistre toutes les entrées/sorties dans le journal des -erreurs de la manière souhaitée.
+
mod_dumpio
Dumps all I/O to error log as desired.
mod_echo
Un simple serveur d'écho pour illustrer les modules de protocole
mod_env
Modifie l'environnement transmis aux scripts CGI et aux diff --git a/docs/manual/mod/mod_dumpio.html b/docs/manual/mod/mod_dumpio.html index 01af4cdcfca..20eaeafeaab 100644 --- a/docs/manual/mod/mod_dumpio.html +++ b/docs/manual/mod/mod_dumpio.html @@ -4,10 +4,6 @@ URI: mod_dumpio.html.en Content-Language: en Content-type: text/html; charset=ISO-8859-1 -URI: mod_dumpio.html.fr -Content-Language: fr -Content-type: text/html; charset=ISO-8859-1 - URI: mod_dumpio.html.ja.utf8 Content-Language: ja Content-type: text/html; charset=UTF-8 diff --git a/docs/manual/mod/mod_dumpio.xml.meta b/docs/manual/mod/mod_dumpio.xml.meta index 1385737381f..1284e2fde37 100644 --- a/docs/manual/mod/mod_dumpio.xml.meta +++ b/docs/manual/mod/mod_dumpio.xml.meta @@ -8,7 +8,6 @@ en - fr ja diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en index a9d107ee812..206c1cc387b 100644 --- a/docs/manual/mod/mod_headers.html.en +++ b/docs/manual/mod/mod_headers.html.en @@ -89,7 +89,8 @@ RequestHeader unset MirrorID configuration is traversed, early headers can only be set in a main server or virtual host context. Early directives cannot depend on a request path, so they will fail in contexts such as - <Directory> or <Location>.

+ <Directory> or + <Location>.

top

Examples

@@ -207,14 +208,14 @@ Header merge Cache-Control no-store env=NO_STORE -
Description:Configure HTTP response headers
Syntax:Header [condition] add|append|echo|edit|edit*|merge|set|setifempty|unset|note -header [[expr=]value]] [replacement] -[early|env=[!]variable]|expr=expression] +header [[expr=]value [replacement +[early|env=[!]varname|expr=expression]]]
Context:server config, virtual host, directory, .htaccess
Override:FileInfo
Status:Extension
Module:mod_headers
Compatibility:SetIfEmpty available in 2.4.7 and later, expr= value +
Compatibility:SetIfEmpty available in 2.4.7 and later, expr=value available in 2.4.10 and later

This directive can replace, merge or remove HTTP response @@ -421,14 +422,14 @@ available in 2.4.10 and later -
Description:Configure HTTP request headers
Syntax:RequestHeader add|append|edit|edit*|merge|set|setifempty|unset -header [[expr=]value] [replacement] -[early|env=[!]variable]|expr=expression] +header [[expr=]value [replacement +[early|env=[!]varname|expr=expression]]]
Context:server config, virtual host, directory, .htaccess
Override:FileInfo
Status:Extension
Module:mod_headers
Compatibility:SetIfEmpty available in 2.4.7 and later, expr= value +
Compatibility:SetIfEmpty available in 2.4.7 and later, expr=value available in 2.4.10 and later

This directive can replace, merge, change or remove HTTP request diff --git a/docs/manual/mod/mod_proxy_scgi.html.en b/docs/manual/mod/mod_proxy_scgi.html.en index fb4266e0a44..5c8f9466f01 100644 --- a/docs/manual/mod/mod_proxy_scgi.html.en +++ b/docs/manual/mod/mod_proxy_scgi.html.en @@ -111,11 +111,11 @@ backend

The ProxySCGIInternalRedirect enables the backend to internally redirect the gateway to a different URL. This feature - origins in mod_cgi, which internally redirects the - response, if the response status is OK (200) and + originates in mod_cgi, which internally redirects the + response if the response status is OK (200) and the response contains a Location header and its value starts with a slash (/). This value is interpreted as a new local - URL the apache internally redirects to.

+ URL that Apache httpd internally redirects to.

mod_proxy_scgi does the same as mod_cgi in this regard, except that you can turn off the @@ -137,10 +137,10 @@ header Module:mod_proxy_scgi

The ProxySCGISendfile directive enables the - SCGI backend to let files serve directly by the gateway. This is useful - performance purposes -- the httpd can use sendfile or other + SCGI backend to let files be served directly by the gateway. This is useful + for performance purposes — httpd can use sendfile or other optimizations, which are not possible if the file comes over the backend - socket.

+ socket. Additionally, the file contents are not transmitted twice.

The ProxySCGISendfile argument determines the gateway behaviour:

@@ -149,20 +149,20 @@ header
On
The gateway looks for a backend response header called - X-Sendfile and interprets the value as filename to serve. The - header is removed from the final response headers. This is equivalent to + X-Sendfile and interprets the value as the filename to serve. + The header is removed from the final response headers. This is equivalent to ProxySCGISendfile X-Sendfile.
anything else
Similar to On, but instead of the hardcoded header name - the argument is applied as header name.
+ X-Sendfile, the argument is used as the header name.
-

Example

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

+# Use a different header
+ProxySCGISendfile X-Send-Static
diff --git a/docs/manual/mod/mod_proxy_wstunnel.html.en b/docs/manual/mod/mod_proxy_wstunnel.html.en index 3ee4a32d121..9ebc6a0349b 100644 --- a/docs/manual/mod/mod_proxy_wstunnel.html.en +++ b/docs/manual/mod/mod_proxy_wstunnel.html.en @@ -98,8 +98,7 @@ ProxyPass /wss2/ wss://echo.websocket.org/ Module:mod_proxy_wstunnel

This directive imposes a maximum amount of time for the tunnel to be - left open while idle. This directive is ignored if ProxyWebsocketAsync - is enabled and the running MPM supports the necessary features

+ left open while idle.

diff --git a/docs/manual/mod/mpm_common.html.de b/docs/manual/mod/mpm_common.html.de index e732082da98..fa1058c15de 100644 --- a/docs/manual/mod/mpm_common.html.de +++ b/docs/manual/mod/mpm_common.html.de @@ -120,8 +120,8 @@ Ausnahmefehler behandeln lassen kann - - + + diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de index 13473665184..d85f2d9a787 100644 --- a/docs/manual/mod/quickreference.html.de +++ b/docs/manual/mod/quickreference.html.de @@ -490,13 +490,13 @@ found angegebenen MIME-Content-Type - @@ -845,8 +845,8 @@ extensions ... @@ -837,8 +837,8 @@ extensions ... media type in the HTTP Content-Type header field - @@ -844,8 +844,8 @@ extensions ... media type in the HTTP Content-Type header field - diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8 index 0ff5b1e6e26..4b97cd66af8 100644 --- a/docs/manual/mod/quickreference.html.tr.utf8 +++ b/docs/manual/mod/quickreference.html.tr.utf8 @@ -487,8 +487,8 @@ found geçecek süre için bir zaman aşımı belirler. @@ -835,8 +835,8 @@ extensions ... media type in the HTTP Content-Type header field - @@ -832,8 +832,8 @@ extensions ...
Beschreibung:Specify a timeout after which a gracefully shutdown server will exit.
Syntax:GracefulShutDownTimeout seconds
Voreinstellung:GracefulShutDownTimeout 0
Syntax:GracefulShutdownTimeout seconds
Voreinstellung:GracefulShutdownTimeout 0
Kontext:Serverkonfiguration
Status:MPM
Modul:prefork, worker, event
ForensicLog filename|pipesvE
Sets filename of the forensic log
GprofDir /tmp/gprof/|/tmp/gprof/%svC
Directory to write gmon.out profiling data to.
GracefulShutDownTimeout secondssM
Specify a timeout after which a gracefully shutdown server +
GracefulShutdownTimeout seconds 0 sM
Specify a timeout after which a gracefully shutdown server will exit.
Group unix-group #-1 sB
Group under which the server will answer requests
Header [condition] add|append|echo|edit|edit*|merge|set|setifempty|unset|note -header [[expr=]value]] [replacement] -[early|env=[!]variable]|expr=expression] +header [[expr=]value [replacement +[early|env=[!]varname|expr=expression]]] svdhE
Configure HTTP response headers
HeaderName filenamesvdhB
Name of the file that will be inserted at the top of the index listing
vdhB
Removes any content type associations for a set of file extensions
RequestHeader add|append|edit|edit*|merge|set|setifempty|unset -header [[expr=]value] [replacement] -[early|env=[!]variable]|expr=expression] +header [[expr=]value [replacement +[early|env=[!]varname|expr=expression]]] svdhE
Configure HTTP request headers
RequestReadTimeout [header=timeout[-maxtimeout][,MinRate=rate] diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 34f69ffc740..2aa74eb3f01 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -490,8 +490,8 @@ will exit.
Group unix-group #-1 sB
Group under which the server will answer requests
Header [condition] add|append|echo|edit|edit*|merge|set|setifempty|unset|note -header [[expr=]value]] [replacement] -[early|env=[!]variable]|expr=expression] +header [[expr=]value [replacement +[early|env=[!]varname|expr=expression]]] svdhE
Configure HTTP response headers
HeaderName filenamesvdhB
Name of the file that will be inserted at the top of the index listing
vdhB
Removes any content type associations for a set of file extensions
RequestHeader add|append|edit|edit*|merge|set|setifempty|unset -header [[expr=]value] [replacement] -[early|env=[!]variable]|expr=expression] +header [[expr=]value [replacement +[early|env=[!]varname|expr=expression]]] svdhE
Configure HTTP request headers
RequestReadTimeout [header=timeout[-maxtimeout][,MinRate=rate] diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es index f81be83f09e..9e9049ad75c 100644 --- a/docs/manual/mod/quickreference.html.es +++ b/docs/manual/mod/quickreference.html.es @@ -492,13 +492,13 @@ found
ForensicLog filename|pipesvE
Sets filename of the forensic log
GprofDir /tmp/gprof/|/tmp/gprof/%svC
Directory to write gmon.out profiling data to.
GracefulShutDownTimeout secondssM
Specify a timeout after which a gracefully shutdown server +
GracefulShutdownTimeout seconds 0 sM
Specify a timeout after which a gracefully shutdown server will exit.
Group unix-group #-1 sB
Group under which the server will answer requests
Header [condition] add|append|echo|edit|edit*|merge|set|setifempty|unset|note -header [[expr=]value]] [replacement] -[early|env=[!]variable]|expr=expression] +header [[expr=]value [replacement +[early|env=[!]varname|expr=expression]]] svdhE
Configure HTTP response headers
HeaderName filenamesvdhB
Name of the file that will be inserted at the top of the index listing
vdhB
Removes any content type associations for a set of file extensions
RequestHeader add|append|edit|edit*|merge|set|setifempty|unset -header [[expr=]value] [replacement] -[early|env=[!]variable]|expr=expression] +header [[expr=]value [replacement +[early|env=[!]varname|expr=expression]]] svdhE
Configure HTTP request headers
RequestReadTimeout [header=timeout[-maxtimeout][,MinRate=rate] diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr index 181e1d7e023..eeece2bdb41 100644 --- a/docs/manual/mod/quickreference.html.ko.euc-kr +++ b/docs/manual/mod/quickreference.html.ko.euc-kr @@ -460,7 +460,7 @@ found
ForensicLog filename|pipesvE
Sets filename of the forensic log
GprofDir /tmp/gprof/|/tmp/gprof/%svC
Directory to write gmon.out profiling data to.
GracefulShutDownTimeout secondssM
Specify a timeout after which a gracefully shutdown server +
GracefulShutdownTimeout seconds 0 sM
Specify a timeout after which a gracefully shutdown server will exit.
Group unix-group #-1 sB
Group under which the server will answer requests
Group unix-grubu #-1 sT
İsteklere yanıt verecek sunucunun ait olacağı grubu belirler.
Header [condition] add|append|echo|edit|edit*|merge|set|setifempty|unset|note -header [[expr=]value]] [replacement] -[early|env=[!]variable]|expr=expression] +header [[expr=]value [replacement +[early|env=[!]varname|expr=expression]]] skdhE
Configure HTTP response headers
HeaderName dosya-ismiskdhT
Dizin listesinin tepesine yerleştirilecek dosyanın ismini belirler.
kdhT
Removes any content type associations for a set of file extensions
RequestHeader add|append|edit|edit*|merge|set|setifempty|unset -header [[expr=]value] [replacement] -[early|env=[!]variable]|expr=expression] +header [[expr=]value [replacement +[early|env=[!]varname|expr=expression]]] skdhE
Configure HTTP request headers
RequestReadTimeout [header=timeout[-maxtimeout][,MinRate=rate] diff --git a/docs/manual/mod/quickreference.html.zh-cn.utf8 b/docs/manual/mod/quickreference.html.zh-cn.utf8 index f61cbdec083..3411f89926d 100644 --- a/docs/manual/mod/quickreference.html.zh-cn.utf8 +++ b/docs/manual/mod/quickreference.html.zh-cn.utf8 @@ -480,13 +480,13 @@ found
ForensicLog filename|pipesvE
Sets filename of the forensic log
GprofDir /tmp/gprof/|/tmp/gprof/%svC
Directory to write gmon.out profiling data to.
GracefulShutDownTimeout secondssM
Specify a timeout after which a gracefully shutdown server +
GracefulShutdownTimeout seconds 0 sM
Specify a timeout after which a gracefully shutdown server will exit.
Group unix-group #-1 sB
Group under which the server will answer requests
Header [condition] add|append|echo|edit|edit*|merge|set|setifempty|unset|note -header [[expr=]value]] [replacement] -[early|env=[!]variable]|expr=expression] +header [[expr=]value [replacement +[early|env=[!]varname|expr=expression]]] svdhE
Configure HTTP response headers
HeaderName filenamesvdhB
Name of the file that will be inserted at the top of the index listing
vdhB
Removes any content type associations for a set of file extensions
RequestHeader add|append|edit|edit*|merge|set|setifempty|unset -header [[expr=]value] [replacement] -[early|env=[!]variable]|expr=expression] +header [[expr=]value [replacement +[early|env=[!]varname|expr=expression]]] svdhE
Configure HTTP request headers
RequestReadTimeout [header=timeout[-maxtimeout][,MinRate=rate]