From 1d7f6ab60e130f51defef5068aff5776b8cccda1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Thu, 20 Feb 2014 15:04:22 +0000 Subject: [PATCH] update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1570214 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/directives.html.de | 2 +- docs/manual/mod/directives.html.es | 2 +- docs/manual/mod/directives.html.fr | 2 +- docs/manual/mod/directives.html.ja.utf8 | 2 +- docs/manual/mod/directives.html.ko.euc-kr | 2 +- docs/manual/mod/directives.html.tr.utf8 | 2 +- docs/manual/mod/directives.html.zh-cn.utf8 | 2 +- docs/manual/mod/mod_lua.html.en | 10 +++++ docs/manual/mod/mod_lua.xml.fr | 2 +- docs/manual/mod/mod_lua.xml.meta | 2 +- docs/manual/mod/quickreference.html.de | 4 +- docs/manual/mod/quickreference.html.es | 4 +- docs/manual/mod/quickreference.html.ja.utf8 | 4 +- docs/manual/mod/quickreference.html.ko.euc-kr | 4 +- docs/manual/mod/quickreference.html.tr.utf8 | 4 +- .../manual/mod/quickreference.html.zh-cn.utf8 | 4 +- docs/manual/rewrite/remapping.html.en | 40 ------------------- 17 files changed, 31 insertions(+), 61 deletions(-) diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de index 743bf78200..718e0159de 100644 --- a/docs/manual/mod/directives.html.de +++ b/docs/manual/mod/directives.html.de @@ -291,8 +291,8 @@
  • HeartbeatAddress
  • HeartbeatListen
  • HeartbeatMaxServers
  • -
  • HeartbeatStorage
  • HeartbeatStorage
  • +
  • HeartbeatStorage
  • HostnameLookups
  • IdentityCheck
  • IdentityCheckTimeout
  • diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es index 3bbf917181..4f2466439a 100644 --- a/docs/manual/mod/directives.html.es +++ b/docs/manual/mod/directives.html.es @@ -294,8 +294,8 @@
  • HeartbeatAddress
  • HeartbeatListen
  • HeartbeatMaxServers
  • -
  • HeartbeatStorage
  • HeartbeatStorage
  • +
  • HeartbeatStorage
  • HostnameLookups
  • IdentityCheck
  • IdentityCheckTimeout
  • diff --git a/docs/manual/mod/directives.html.fr b/docs/manual/mod/directives.html.fr index 02ef50db9a..7b48ef3d07 100644 --- a/docs/manual/mod/directives.html.fr +++ b/docs/manual/mod/directives.html.fr @@ -293,8 +293,8 @@
  • HeartbeatAddress
  • HeartbeatListen
  • HeartbeatMaxServers
  • -
  • HeartbeatStorage
  • HeartbeatStorage
  • +
  • HeartbeatStorage
  • HostnameLookups
  • IdentityCheck
  • IdentityCheckTimeout
  • diff --git a/docs/manual/mod/directives.html.ja.utf8 b/docs/manual/mod/directives.html.ja.utf8 index 53cbb2bb5d..d7052e3374 100644 --- a/docs/manual/mod/directives.html.ja.utf8 +++ b/docs/manual/mod/directives.html.ja.utf8 @@ -289,8 +289,8 @@
  • HeartbeatAddress
  • HeartbeatListen
  • HeartbeatMaxServers
  • -
  • HeartbeatStorage
  • HeartbeatStorage
  • +
  • HeartbeatStorage
  • HostnameLookups
  • IdentityCheck
  • IdentityCheckTimeout
  • diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr index e653925c2e..f1a4adecac 100644 --- a/docs/manual/mod/directives.html.ko.euc-kr +++ b/docs/manual/mod/directives.html.ko.euc-kr @@ -289,8 +289,8 @@
  • HeartbeatAddress
  • HeartbeatListen
  • HeartbeatMaxServers
  • -
  • HeartbeatStorage
  • HeartbeatStorage
  • +
  • HeartbeatStorage
  • HostnameLookups
  • IdentityCheck
  • IdentityCheckTimeout
  • diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8 index e9957d11f1..2eafba99a4 100644 --- a/docs/manual/mod/directives.html.tr.utf8 +++ b/docs/manual/mod/directives.html.tr.utf8 @@ -288,8 +288,8 @@
  • HeartbeatAddress
  • HeartbeatListen
  • HeartbeatMaxServers
  • -
  • HeartbeatStorage
  • HeartbeatStorage
  • +
  • HeartbeatStorage
  • HostnameLookups
  • IdentityCheck
  • IdentityCheckTimeout
  • diff --git a/docs/manual/mod/directives.html.zh-cn.utf8 b/docs/manual/mod/directives.html.zh-cn.utf8 index 1089dd5ac7..76eb86c98f 100644 --- a/docs/manual/mod/directives.html.zh-cn.utf8 +++ b/docs/manual/mod/directives.html.zh-cn.utf8 @@ -287,8 +287,8 @@
  • HeartbeatAddress
  • HeartbeatListen
  • HeartbeatMaxServers
  • -
  • HeartbeatStorage
  • HeartbeatStorage
  • +
  • HeartbeatStorage
  • HostnameLookups
  • IdentityCheck
  • IdentityCheckTimeout
  • diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en index 2e38afc452..246d39662d 100644 --- a/docs/manual/mod/mod_lua.html.en +++ b/docs/manual/mod/mod_lua.html.en @@ -996,6 +996,16 @@ if r:wsupgrade() then end +
    r:wspeek() -- Checks if any data is ready to be read
    +
    +-- Sleep while nothing is being sent to us...
    +while r:wspeek() == false do
    +   r.usleep(50000)
    +end
    +-- We have data ready!
    +local line = r:wsread()
    + +
    top

    Logging Functions

    diff --git a/docs/manual/mod/mod_lua.xml.fr b/docs/manual/mod/mod_lua.xml.fr index 96263c411d..74410f71e1 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_lua.xml.meta b/docs/manual/mod/mod_lua.xml.meta index b55c7710e9..8fc1a0efdf 100644 --- a/docs/manual/mod/mod_lua.xml.meta +++ b/docs/manual/mod/mod_lua.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 172fa7b1bd..5ffa199edb 100644 --- a/docs/manual/mod/quickreference.html.de +++ b/docs/manual/mod/quickreference.html.de @@ -488,8 +488,8 @@ of the index listing HeartbeatListenaddr:portsXmulticast address to listen for incoming heartbeat requests HeartbeatMaxServers number-of-servers 10 sXSpecifies the maximum number of servers that will be sending heartbeat requests to this server -HeartbeatStorage file-path logs/hb.dat sXPath to store heartbeat data -HeartbeatStorage file-path logs/hb.dat sXPath to read heartbeat data +HeartbeatStorage file-path logs/hb.dat sXPath to read heartbeat data +HeartbeatStorage file-path logs/hb.dat sXPath to store heartbeat data HostnameLookups On|Off|Double Off svdCAktiviert DNS-Lookups auf Client-IP-Adressen IdentityCheck On|Off Off svdEEnables logging of the RFC 1413 identity of the remote user diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es index 4703cab69b..6bf07a0a12 100644 --- a/docs/manual/mod/quickreference.html.es +++ b/docs/manual/mod/quickreference.html.es @@ -490,8 +490,8 @@ of the index listing HeartbeatListenaddr:portsXmulticast address to listen for incoming heartbeat requests HeartbeatMaxServers number-of-servers 10 sXSpecifies the maximum number of servers that will be sending heartbeat requests to this server -HeartbeatStorage file-path logs/hb.dat sXPath to store heartbeat data -HeartbeatStorage file-path logs/hb.dat sXPath to read heartbeat data +HeartbeatStorage file-path logs/hb.dat sXPath to read heartbeat data +HeartbeatStorage file-path logs/hb.dat sXPath to store heartbeat data HostnameLookups On|Off|Double Off svdCEnables DNS lookups on client IP addresses IdentityCheck On|Off Off svdEEnables logging of the RFC 1413 identity of the remote user diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8 index ee9ede65d5..9a8194bf4f 100644 --- a/docs/manual/mod/quickreference.html.ja.utf8 +++ b/docs/manual/mod/quickreference.html.ja.utf8 @@ -461,8 +461,8 @@ requests HeartbeatListenaddr:portsXmulticast address to listen for incoming heartbeat requests HeartbeatMaxServers number-of-servers 10 sXSpecifies the maximum number of servers that will be sending heartbeat requests to this server -HeartbeatStorage file-path logs/hb.dat sXPath to store heartbeat data -HeartbeatStorage file-path logs/hb.dat sXPath to read heartbeat data +HeartbeatStorage file-path logs/hb.dat sXPath to read heartbeat data +HeartbeatStorage file-path logs/hb.dat sXPath to store heartbeat data HostnameLookups On|Off|Double Off svdCクライアントの IP アドレスの DNS ルックアップを 有効にする IdentityCheck On|Off Off svdEリモートユーザの RFC 1413 によるアイデンティティのロギングを diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr index ab0f4d69cb..6ee34d9a2e 100644 --- a/docs/manual/mod/quickreference.html.ko.euc-kr +++ b/docs/manual/mod/quickreference.html.ko.euc-kr @@ -455,8 +455,8 @@ requests HeartbeatListenaddr:portsXmulticast address to listen for incoming heartbeat requests HeartbeatMaxServers number-of-servers 10 sXSpecifies the maximum number of servers that will be sending heartbeat requests to this server -HeartbeatStorage file-path logs/hb.dat sXPath to store heartbeat data -HeartbeatStorage file-path logs/hb.dat sXPath to read heartbeat data +HeartbeatStorage file-path logs/hb.dat sXPath to read heartbeat data +HeartbeatStorage file-path logs/hb.dat sXPath to store heartbeat data HostnameLookups On|Off|Double Off svdCEnables DNS lookups on client IP addresses IdentityCheck On|Off Off svdE¿ø°Ý »ç¿ëÀÚÀÇ RFC 1413 ½Å¿øÀ» ·Î±×¿¡ ±â·ÏÇÑ´Ù IdentityCheckTimeout seconds 30 svdEident ¿äûÀÇ ½Ã°£Á¦ÇÑÀ» ÁöÁ¤ÇÑ´Ù diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8 index 17392f1eda..d61c442b68 100644 --- a/docs/manual/mod/quickreference.html.tr.utf8 +++ b/docs/manual/mod/quickreference.html.tr.utf8 @@ -480,8 +480,8 @@ belirler. HeartbeatListenaddr:portsDmulticast address to listen for incoming heartbeat requests HeartbeatMaxServers number-of-servers 10 sDSpecifies the maximum number of servers that will be sending heartbeat requests to this server -HeartbeatStorage file-path logs/hb.dat sDPath to store heartbeat data -HeartbeatStorage file-path logs/hb.dat sDPath to read heartbeat data +HeartbeatStorage file-path logs/hb.dat sDPath to read heartbeat data +HeartbeatStorage file-path logs/hb.dat sDPath to store heartbeat data HostnameLookups On|Off|Double Off skdÇİstemci IP adresleri üzerinde DNS sorgularını etkin kılar. IdentityCheck On|Off Off skdEEnables logging of the RFC 1413 identity of the remote diff --git a/docs/manual/mod/quickreference.html.zh-cn.utf8 b/docs/manual/mod/quickreference.html.zh-cn.utf8 index e533afb82d..a7e44bb92a 100644 --- a/docs/manual/mod/quickreference.html.zh-cn.utf8 +++ b/docs/manual/mod/quickreference.html.zh-cn.utf8 @@ -478,8 +478,8 @@ of the index listing HeartbeatListenaddr:portsXmulticast address to listen for incoming heartbeat requests HeartbeatMaxServers number-of-servers 10 sXSpecifies the maximum number of servers that will be sending heartbeat requests to this server -HeartbeatStorage file-path logs/hb.dat sXPath to store heartbeat data -HeartbeatStorage file-path logs/hb.dat sXPath to read heartbeat data +HeartbeatStorage file-path logs/hb.dat sXPath to read heartbeat data +HeartbeatStorage file-path logs/hb.dat sXPath to store heartbeat data HostnameLookups On|Off|Double Off svdCEnables DNS lookups on client IP addresses IdentityCheck On|Off Off svdEEnables logging of the RFC 1413 identity of the remote user diff --git a/docs/manual/rewrite/remapping.html.en b/docs/manual/rewrite/remapping.html.en index 56356043c3..6dcc1c4635 100644 --- a/docs/manual/rewrite/remapping.html.en +++ b/docs/manual/rewrite/remapping.html.en @@ -45,7 +45,6 @@ configuration.
  • Canonical Hostnames
  • Search for pages in more than one directory
  • Redirecting to Geographically Distributed Servers
  • -
  • Browser Dependent Content
  • Canonical URLs
  • Moved DocumentRoot
  • Fallback Resource
  • @@ -434,45 +433,6 @@ com http://www.example.com/
    -
    top
    -
    -

    Browser Dependent Content

    - - - -
    -
    Description:
    - -
    -

    We wish to provide different content based on the browser, or - user-agent, which is requesting the content.

    -
    - -
    Solution:
    - -
    -

    We have to decide, based on the HTTP header "User-Agent", - which content to serve. The following config - does the following: If the HTTP header "User-Agent" - contains "Mozilla/3", the page foo.html - is rewritten to foo.NS.html and the - rewriting stops. If the browser is "Lynx" or "Mozilla" of - version 1 or 2, the URL becomes foo.20.html. - All other browsers receive page foo.32.html. - This is done with the following ruleset:

    - -
    RewriteCond %{HTTP_USER_AGENT}  ^Mozilla/3.*
    -RewriteRule ^foo\.html$         foo.NS.html          [L]
    -
    -RewriteCond %{HTTP_USER_AGENT}  ^Lynx/ [OR]
    -RewriteCond %{HTTP_USER_AGENT}  ^Mozilla/[12]
    -RewriteRule ^foo\.html$         foo.20.html          [L]
    -
    -RewriteRule ^foo\.html$         foo.32.html          [L]
    - -
    -
    -
    top

    Canonical URLs

    -- 2.40.0