From: Eric Covener Date: Tue, 3 Jan 2012 20:48:22 +0000 (+0000) Subject: xforms X-Git-Tag: 2.5.0-alpha~7606 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea2437c2c803f43a591f8cd4e24747db8dd5670f;p=thirdparty%2Fapache%2Fhttpd.git xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1226942 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index 6263d67ec5a..8071df3ef80 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -268,8 +268,6 @@
  • Header
  • HeaderName
  • HeartbeatAddress
    • -
  • HeartbeatListen
    • -
  • HeartbeatStorage
  • HeartbeatStorage
  • HostnameLookups
  • IdentityCheck
    • diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en index db023af9c56..eb520af3886 100644 --- a/docs/manual/mod/index.html.en +++ b/docs/manual/mod/index.html.en @@ -135,8 +135,8 @@ delivery to the client
    mod_firehose
    Multiplexes all I/O to a given file or pipe.
    mod_headers
    Customization of HTTP request and response headers
    -
    mod_heartbeat
    -
    mod_heartmonitor
    +
    mod_heartbeat
    sends messages with server status to frontend proxy
    +
    mod_heartmonitor
    centralized monitor for mod_heartbeat origin servers
    mod_ident
    RFC 1413 ident lookups
    mod_imagemap
    Server-side imagemap processing
    mod_include
    Server-parsed html documents (Server Side Includes)
    @@ -146,7 +146,7 @@ configuration
    mod_lbmethod_bybusyness
    Pending Request Counting load balancer scheduler algorithm for mod_proxy_balancer
    mod_lbmethod_byrequests
    Request Counting load balancer scheduler algorithm for mod_proxy_balancer
    mod_lbmethod_bytraffic
    Weighted Traffic Counting load balancer scheduler algorithm for mod_proxy_balancer
    -
    mod_lbmethod_heartbeat
    This document is still under development.
    +
    mod_lbmethod_heartbeat
    Heartbeat Traffic Counting load balancer scheduler algorithm for mod_proxy_balancer
    mod_ldap
    LDAP connection pooling and result caching services for use by other LDAP modules
    mod_log_config
    Logging of the requests made to the server
    diff --git a/docs/manual/mod/mod_heartbeat.html.en b/docs/manual/mod/mod_heartbeat.html.en index 48165435536..a8c602ec568 100644 --- a/docs/manual/mod/mod_heartbeat.html.en +++ b/docs/manual/mod/mod_heartbeat.html.en @@ -23,14 +23,18 @@

    Available Languages:  en 

    - - +
    Description:
    Status:Extension
    + - -
    Description:sends messages with server status to frontend proxy
    Status:Experimental
    Module Identifier:heartbeat_module
    Source File:mod_heartbeat.c
    Compatibility:Available in 2.3 and later
    +Source File:mod_heartbeat +Compatibility:Available in Apache 2.3 and later

    Summary

    -
    This document is still under development.
    +

    mod_heartbeat sends multicast messages to a mod_heartmonitor listener +that advertises the servers current connection count. Usually, mod_heartmonitor +will be running on a proxy server with mod_lbmethod_heartbeat loaded, which allows +ProxyPass to use the "heartbeat" lbmethod inside +of ProxyPass.

    Directives

    diff --git a/docs/manual/mod/mod_heartmonitor.html.en b/docs/manual/mod/mod_heartmonitor.html.en index 29fe8fd9748..cf874a94c66 100644 --- a/docs/manual/mod/mod_heartmonitor.html.en +++ b/docs/manual/mod/mod_heartmonitor.html.en @@ -21,52 +21,48 @@

    Apache Module mod_heartmonitor

    -

    Available Languages:  en 

    +

    Available Languages:  en 

    - - +
    Description:
    Status:Extension
    + - -
    Description:centralized monitor for mod_heartbeat origin servers
    Status:Experimental
    Module Identifier:heartmonitor_module
    Source File:mod_heartmonitor.c
    Compatibility:Available in 2.3 and later
    +Source File:mod_heartmonitor +Compatibility:Available in Apache 2.3 and later

    Summary

    -
    This document is still under development.
    +

    +mod_heartmonitor listens for server status messages generated +by mod_heartbeat enabled servers and makes their status +available to mod_lbmethod_heartbeat. This allows +ProxyPass to use the "heartbeat" +lbmethod inside of ProxyPass. +

    + +

    This module uses the services of mod_slotmem_shm when +available instead of flat-file storage. No configuration is required to +use mod_slotmem_shm.

    top
    -

    HeartbeatListen Directive

    - - - - - - -
    Description:Address to listen for heartbeat requests
    Syntax:
    Context:server config
    Status:Extension
    Module:mod_heartmonitor
    -
    This document is still under development.
    - -
    -
    top
    -

    HeartbeatStorage Directive

    +

    HeartbeatAddress Directive

    - - - + + + - - -
    Description:Path to store heartbeat data
    Syntax:HeartbeatStorage file-path
    Default:HeartbeatStorage logs/hb.dat
    Description:Address to send heartbeat requests
    Syntax:HeartbeatAddress addr:port
    Default:disabled
    Context:server config
    Status:Extension
    Module:mod_heartmonitor
    -
    This document is still under development.
    - -
    +Status:Experimental +Module:mod_heartbeat +

    The documentation for this directive has + not been translated yet. Please have a look at the English + version.

    -

    Available Languages:  en 

    +

    Available Languages:  en 

    diff --git a/docs/manual/mod/mod_lbmethod_heartbeat.html.en b/docs/manual/mod/mod_lbmethod_heartbeat.html.en index 4b4a0b81bd2..7e2855a5765 100644 --- a/docs/manual/mod/mod_lbmethod_heartbeat.html.en +++ b/docs/manual/mod/mod_lbmethod_heartbeat.html.en @@ -23,14 +23,20 @@

    Available Languages:  en 

    - - +
    Description: This document is still under development.
    Status:Extension
    +
    Description:Heartbeat Traffic Counting load balancer scheduler algorithm for mod_proxy_balancer
    Status:Experimental
    Module Identifier:lbmethod_heartbeat_module
    Source File:mod_lbmethod_heartbeat.c
    Compatibility:Available in version 2.3 and later

    Summary

    -
    This document is still under development.
    +

    lbmethod=heartbeat uses the services of mod_heartmonitor to balance between origin servers that are providing +heartbeat info via the mod_heartbeat module.

    + +

    This modules load balancing algorithm favors servers with more ready (idle) +capacity over time, but does not select the server with the most ready capacity +every time. Servers that have 0 active clients are penalized, with the +assumption that they are not fully initialized.

    Directives

    diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index e3c12d7b4fc..3898af093da 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - + +