From: Richard Bowen Date: Wed, 25 Mar 2015 18:39:32 +0000 (+0000) Subject: Rebuild X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4b2cddc2e89d7b3e1c930c485020b7c445e91c3;p=thirdparty%2Fapache%2Fhttpd.git Rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669202 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 2875ae8f5f9..0cf1c5cbc73 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -2248,8 +2248,9 @@ requests on a persistent connection higher the timeout, the more server processes will be kept occupied waiting on connections with idle clients.

-

In a name-based virtual host context, the value of the first - defined virtual host best matching the local IP and port will be used.

+

If KeepAliveTimeout is not + set for a name-based virtual host, the value of the first defined + virtual host best matching the local IP and port will be used.

top
diff --git a/docs/manual/mod/mod_ext_filter.html.fr b/docs/manual/mod/mod_ext_filter.html.fr index b4c63785c3a..22ebe2bb810 100644 --- a/docs/manual/mod/mod_ext_filter.html.fr +++ b/docs/manual/mod/mod_ext_filter.html.fr @@ -29,6 +29,8 @@  ja  |  ko 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.
diff --git a/docs/manual/mod/mod_ext_filter.xml.fr b/docs/manual/mod/mod_ext_filter.xml.fr index d94c7e953b6..c424dfb6f0d 100644 --- a/docs/manual/mod/mod_ext_filter.xml.fr +++ b/docs/manual/mod/mod_ext_filter.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_ext_filter.xml.ja b/docs/manual/mod/mod_ext_filter.xml.ja index fb3e51bb217..166c47f7925 100644 --- a/docs/manual/mod/mod_ext_filter.xml.ja +++ b/docs/manual/mod/mod_ext_filter.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta index decc0a7b1e8..0be21e86f4d 100644 --- a/docs/manual/mod/mod_rewrite.xml.meta +++ b/docs/manual/mod/mod_rewrite.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de index f360a0aab09..173a147d3e2 100644 --- a/docs/manual/mod/quickreference.html.de +++ b/docs/manual/mod/quickreference.html.de @@ -882,6 +882,7 @@ must succeed for the enclosing directive to not fail.
Description:Fait traiter le corps de la réponse par un programme externe avant de l'envoyer au client
Statut:Extension
RewriteEngine on|off off svdhE
Enables or disables runtime rewriting engine
RewriteMap MapName MapType:MapSource + MapTypeOptions svE
Defines a mapping function for key-lookup
RewriteOptions OptionssvdhE
Sets some special options for the rewrite engine
RewriteRule diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index f282c70e99d..833ab25f6ed 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -874,6 +874,7 @@ must succeed for the enclosing directive to not fail.
RewriteEngine on|off off svdhE
Enables or disables runtime rewriting engine
RewriteMap MapName MapType:MapSource + MapTypeOptions svE
Defines a mapping function for key-lookup
RewriteOptions OptionssvdhE
Sets some special options for the rewrite engine
RewriteRule diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es index 63bbffe11db..69734c944a1 100644 --- a/docs/manual/mod/quickreference.html.es +++ b/docs/manual/mod/quickreference.html.es @@ -881,6 +881,7 @@ must succeed for the enclosing directive to not fail.
RewriteEngine on|off off svdhE
Enables or disables runtime rewriting engine
RewriteMap MapName MapType:MapSource + MapTypeOptions svE
Defines a mapping function for key-lookup
RewriteOptions OptionssvdhE
Sets some special options for the rewrite engine
RewriteRule diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8 index 58b70575cec..84826f7a49a 100644 --- a/docs/manual/mod/quickreference.html.ja.utf8 +++ b/docs/manual/mod/quickreference.html.ja.utf8 @@ -820,6 +820,7 @@ must succeed for the enclosing directive to not fail.
RewriteEngine on|off off svdhE
Enables or disables runtime rewriting engine
RewriteMap MapName MapType:MapSource + MapTypeOptions svE
Defines a mapping function for key-lookup
RewriteOptions OptionssvdhE
Sets some special options for the rewrite engine
RewriteRule diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr index 288522dcd5d..f87624e7fed 100644 --- a/docs/manual/mod/quickreference.html.ko.euc-kr +++ b/docs/manual/mod/quickreference.html.ko.euc-kr @@ -837,6 +837,7 @@ must succeed for the enclosing directive to not fail.
RewriteEngine on|off off svdhE
Enables or disables runtime rewriting engine
RewriteMap MapName MapType:MapSource + MapTypeOptions svE
Defines a mapping function for key-lookup
RewriteOptions OptionssvdhE
Sets some special options for the rewrite engine
RewriteRule diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8 index b549abfaac3..a537b7be95c 100644 --- a/docs/manual/mod/quickreference.html.tr.utf8 +++ b/docs/manual/mod/quickreference.html.tr.utf8 @@ -872,6 +872,7 @@ must succeed for the enclosing directive to not fail.
RewriteEngine on|off off skdhE
Enables or disables runtime rewriting engine
RewriteMap MapName MapType:MapSource + MapTypeOptions skE
Defines a mapping function for key-lookup
RewriteOptions OptionsskdhE
Sets some special options for the rewrite engine
RewriteRule diff --git a/docs/manual/mod/quickreference.html.zh-cn.utf8 b/docs/manual/mod/quickreference.html.zh-cn.utf8 index ffbea861f8e..5d9eacd661e 100644 --- a/docs/manual/mod/quickreference.html.zh-cn.utf8 +++ b/docs/manual/mod/quickreference.html.zh-cn.utf8 @@ -869,6 +869,7 @@ must succeed for the enclosing directive to not fail.
RewriteEngine on|off off svdhE
Enables or disables runtime rewriting engine
RewriteMap MapName MapType:MapSource + MapTypeOptions svE
Defines a mapping function for key-lookup
RewriteOptions OptionssvdhE
Sets some special options for the rewrite engine
RewriteRule diff --git a/docs/manual/programs/rotatelogs.html.en b/docs/manual/programs/rotatelogs.html.en index e9538066229..88a0bedddfe 100644 --- a/docs/manual/programs/rotatelogs.html.en +++ b/docs/manual/programs/rotatelogs.html.en @@ -91,7 +91,7 @@ and when the first request is handled, meaning that the associated logfile does not "exist" until then, which causes problems from some automated logging tools) -
-d
+
-D
Creates the parent directories of the path that the log file will be placed in if they do not already exist. This allows strftime(3) formatting to be used in the path and not just the filename.
diff --git a/docs/manual/rewrite/rewritemap.html.en b/docs/manual/rewrite/rewritemap.html.en index d91b2d20440..ff5fee698c3 100644 --- a/docs/manual/rewrite/rewritemap.html.en +++ b/docs/manual/rewrite/rewritemap.html.en @@ -351,6 +351,12 @@ by many requests. a context that does not have RewriteEngine set to on.

+

By default, external rewriting programs are run as the + user:group who started httpd. This can be changed on UNIX systems + by passing user name and group name as third argument to + RewriteMap in the + username:groupname format.

+

This feature utilizes the rewrite-map mutex, which is required for reliable communication with the program. The mutex mechanism and lock file can be configured with the @@ -360,7 +366,7 @@ by many requests. underscores in a request URI.

Rewrite configuration

- 
RewriteMap d2u prg:/www/bin/dash2under.pl

+    
RewriteMap d2u prg:/www/bin/dash2under.pl apache:apache

 RewriteRule - ${d2u:%{REQUEST_URI}}