From c1f2f931493d8e154b051cbb0c85dd7caabe0e4f Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Sat, 21 Apr 2018 15:45:59 +0000 Subject: [PATCH] xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829715 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_authz_core.html.en | 25 ++++---- docs/manual/mod/mod_authz_core.xml.fr | 2 +- docs/manual/mod/mod_authz_core.xml.meta | 2 +- docs/manual/mod/mod_filter.xml.fr | 2 +- docs/manual/mod/mod_filter.xml.meta | 2 +- .../mod/mod_lbmethod_byrequests.html.en | 4 +- .../manual/mod/mod_lbmethod_byrequests.xml.fr | 2 +- .../mod/mod_lbmethod_byrequests.xml.meta | 2 +- .../manual/mod/mod_lbmethod_bytraffic.html.en | 4 +- docs/manual/mod/mod_lbmethod_bytraffic.xml.fr | 2 +- .../mod/mod_lbmethod_bytraffic.xml.meta | 2 +- .../manual/mod/mod_lbmethod_heartbeat.html.en | 4 +- docs/manual/mod/mod_lbmethod_heartbeat.xml.fr | 2 +- .../mod/mod_lbmethod_heartbeat.xml.meta | 2 +- docs/manual/mod/mod_proxy_balancer.html.en | 23 ++++--- docs/manual/mod/mod_proxy_balancer.xml.fr | 2 +- docs/manual/mod/mod_proxy_balancer.xml.ja | 2 +- docs/manual/mod/mod_proxy_balancer.xml.meta | 2 +- docs/manual/mod/mod_slotmem_plain.html.en | 51 ++++++++------- docs/manual/mod/mod_slotmem_plain.xml.fr | 2 +- docs/manual/mod/mod_slotmem_plain.xml.meta | 2 +- docs/manual/mod/mod_slotmem_shm.html.en | 64 +++++++++---------- docs/manual/mod/mod_slotmem_shm.xml.fr | 2 +- docs/manual/mod/mod_slotmem_shm.xml.meta | 2 +- docs/manual/mod/mod_usertrack.html.en | 14 ++-- docs/manual/mod/mod_usertrack.xml.fr | 2 +- docs/manual/mod/mod_usertrack.xml.meta | 2 +- 27 files changed, 112 insertions(+), 115 deletions(-) diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en index 65695ce6a6..8c7186392c 100644 --- a/docs/manual/mod/mod_authz_core.html.en +++ b/docs/manual/mod/mod_authz_core.html.en @@ -66,7 +66,7 @@
  • Comments
    • top
    -

    Authorization Containers

    +

    Authorization Containers

    The authorization container directives <RequireAll>, @@ -109,7 +109,7 @@

    top
    -

    The Require Directives

    +

    The Require Directives

    mod_authz_core provides some generic authorization providers which can be used with the @@ -197,7 +197,7 @@

    The expr provider allows basing authorization decisions on arbitrary expressions.

    - 
    Require expr %{TIME_HOUR} -ge 9 && %{TIME_HOUR} -le 17
    + 
    Require expr "%{TIME_HOUR} -ge 9 && %{TIME_HOUR} -le 17"
    <RequireAll>
@@ -210,7 +210,8 @@
 
 
   
    The syntax is described in the ap_expr
-  documentation.
    
+  documentation. Before httpd 2.4.16, the surrounding double-quotes MUST be
+  omitted.
    
 
   
    Normally, the expression is evaluated before authentication. However, if
   the expression returns false and references the variable
@@ -222,7 +223,7 @@
    top
    -

    Creating Authorization Provider Aliases

    +

    Creating Authorization Provider Aliases

    Extended authorization providers can be created within the configuration file and assigned an alias name. The alias providers can then be referenced @@ -269,7 +270,7 @@ Alias "/secure" "/webpages/secure"

    top
    -

    AuthMerging Directive

    +

    AuthMerging Directive

    top
    -

    <AuthzProviderAlias> Directive

    +

    <AuthzProviderAlias> Directive

    Description:Controls the manner in which each configuration section's authorization logic is combined with that of preceding configuration @@ -336,7 +337,7 @@ sections.
    top
    -

    AuthzSendForbiddenOnFailure Directive

    +

    AuthzSendForbiddenOnFailure Directive

    Description:Enclose a group of directives that represent an extension of a base authorization provider and referenced by the specified @@ -356,7 +357,7 @@ alias
    Description:Send '403 FORBIDDEN' instead of '401 UNAUTHORIZED' if authentication succeeds but authorization fails @@ -384,7 +385,7 @@ authentication succeeds but authorization fails
    top
    -

    Require Directive

    +

    Require Directive

    @@ -524,7 +525,7 @@ Require group admin
    top
    -

    <RequireAll> Directive

    +

    <RequireAll> Directive

    Description:Tests whether an authenticated user is authorized by an authorization provider.
    top
    -

    <RequireAny> Directive

    +

    <RequireAny> Directive

    Description:Enclose a group of authorization directives of which none must fail and at least one must succeed for the enclosing directive to @@ -557,7 +558,7 @@ succeed.
    @@ -596,7 +597,7 @@ must succeed for the enclosing directive to succeed.
    top
    -

    <RequireNone> Directive

    +

    <RequireNone> Directive

    Description:Enclose a group of authorization directives of which one must succeed for the enclosing directive to succeed.
    diff --git a/docs/manual/mod/mod_authz_core.xml.fr b/docs/manual/mod/mod_authz_core.xml.fr index 8d44d18bad..7077733f3c 100644 --- a/docs/manual/mod/mod_authz_core.xml.fr +++ b/docs/manual/mod/mod_authz_core.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_authz_core.xml.meta b/docs/manual/mod/mod_authz_core.xml.meta index 5023ce74e3..248771933a 100644 --- a/docs/manual/mod/mod_authz_core.xml.meta +++ b/docs/manual/mod/mod_authz_core.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_filter.xml.fr b/docs/manual/mod/mod_filter.xml.fr index ed12ea9525..baa717952c 100644 --- a/docs/manual/mod/mod_filter.xml.fr +++ b/docs/manual/mod/mod_filter.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_filter.xml.meta b/docs/manual/mod/mod_filter.xml.meta index 57da411bff..0e2fde742c 100644 --- a/docs/manual/mod/mod_filter.xml.meta +++ b/docs/manual/mod/mod_filter.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_lbmethod_byrequests.html.en b/docs/manual/mod/mod_lbmethod_byrequests.html.en index 8cbaf3c59b..38455d88c5 100644 --- a/docs/manual/mod/mod_lbmethod_byrequests.html.en +++ b/docs/manual/mod/mod_lbmethod_byrequests.html.en @@ -38,7 +38,7 @@

    This module does not provide any configuration directives of its own. It requires the services of mod_proxy_balancer, and -provides the byrequests load balancing method..

    +provides the byrequests load balancing method.

    Topics

      @@ -53,7 +53,7 @@ provides the byrequests load balancing method..

    • Comments
    top
    -

    Request Counting Algorithm

    +

    Request Counting Algorithm

    Enabled via lbmethod=byrequests, the idea behind this scheduler is that we distribute the requests among the diff --git a/docs/manual/mod/mod_lbmethod_byrequests.xml.fr b/docs/manual/mod/mod_lbmethod_byrequests.xml.fr index 17bc91e6cd..26a0882f2f 100644 --- a/docs/manual/mod/mod_lbmethod_byrequests.xml.fr +++ b/docs/manual/mod/mod_lbmethod_byrequests.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_lbmethod_byrequests.xml.meta b/docs/manual/mod/mod_lbmethod_byrequests.xml.meta index d167df8c29..bea7bb4018 100644 --- a/docs/manual/mod/mod_lbmethod_byrequests.xml.meta +++ b/docs/manual/mod/mod_lbmethod_byrequests.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_lbmethod_bytraffic.html.en b/docs/manual/mod/mod_lbmethod_bytraffic.html.en index 271b8f50b7..8d346f33d5 100644 --- a/docs/manual/mod/mod_lbmethod_bytraffic.html.en +++ b/docs/manual/mod/mod_lbmethod_bytraffic.html.en @@ -38,7 +38,7 @@

    This module does not provide any configuration directives of its own. It requires the services of mod_proxy_balancer, and -provides the bytraffic load balancing method..

    +provides the bytraffic load balancing method.

    Topics

      @@ -53,7 +53,7 @@ provides the bytraffic load balancing method..

    • Comments
    top
    -

    Weighted Traffic Counting Algorithm

    +

    Weighted Traffic Counting Algorithm

    Enabled via lbmethod=bytraffic, the idea behind this scheduler is very similar to the Request Counting method, with diff --git a/docs/manual/mod/mod_lbmethod_bytraffic.xml.fr b/docs/manual/mod/mod_lbmethod_bytraffic.xml.fr index 68e8451a36..cbe6b77ad2 100644 --- a/docs/manual/mod/mod_lbmethod_bytraffic.xml.fr +++ b/docs/manual/mod/mod_lbmethod_bytraffic.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_lbmethod_bytraffic.xml.meta b/docs/manual/mod/mod_lbmethod_bytraffic.xml.meta index f746a85642..bc1dbdc556 100644 --- a/docs/manual/mod/mod_lbmethod_bytraffic.xml.meta +++ b/docs/manual/mod/mod_lbmethod_bytraffic.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_lbmethod_heartbeat.html.en b/docs/manual/mod/mod_lbmethod_heartbeat.html.en index 966778faa8..37f5a4fd07 100644 --- a/docs/manual/mod/mod_lbmethod_heartbeat.html.en +++ b/docs/manual/mod/mod_lbmethod_heartbeat.html.en @@ -36,7 +36,7 @@

    Description:Enclose a group of authorization directives of which none must succeed for the enclosing directive to not fail.
    Compatibility:Available in version 2.3 and later

    Summary

    -

    lbmethod=heartbeat uses the services of mod_heartmonitor to balance between origin servers that are providing +

    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) @@ -57,7 +57,7 @@ assumption that they are not fully initialized.

  • Comments
    • top
    -

    HeartbeatStorage Directive

    +

    HeartbeatStorage Directive

    diff --git a/docs/manual/mod/mod_lbmethod_heartbeat.xml.fr b/docs/manual/mod/mod_lbmethod_heartbeat.xml.fr index f012c9a568..20716e078c 100644 --- a/docs/manual/mod/mod_lbmethod_heartbeat.xml.fr +++ b/docs/manual/mod/mod_lbmethod_heartbeat.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_lbmethod_heartbeat.xml.meta b/docs/manual/mod/mod_lbmethod_heartbeat.xml.meta index 8438aa0868..e027bbb595 100644 --- a/docs/manual/mod/mod_lbmethod_heartbeat.xml.meta +++ b/docs/manual/mod/mod_lbmethod_heartbeat.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_proxy_balancer.html.en b/docs/manual/mod/mod_proxy_balancer.html.en index 566b42c369..8382b84988 100644 --- a/docs/manual/mod/mod_proxy_balancer.html.en +++ b/docs/manual/mod/mod_proxy_balancer.html.en @@ -87,17 +87,20 @@
  • Comments
    • top
    -

    Load balancer scheduler algorithm

    +

    Load balancer scheduler algorithm

    -

    At present, there are 3 load balancer scheduler algorithms available - for use: Request Counting, Weighted Traffic Counting and Pending Request - Counting. These are controlled via the lbmethod value of +

    At present, there are 4 load balancer scheduler algorithms available + for use: Request Counting (mod_lbmethod_byrequests), + Weighted Traffic Counting (mod_lbmethod_bytraffic), + Pending Request Counting (mod_lbmethod_bybusyness) and + Heartbeat Traffic Counting (mod_lbmethod_heartbeat). + These are controlled via the lbmethod value of the Balancer definition. See the ProxyPass directive for more information, especially regarding how to configure the Balancer and BalancerMembers.

    top
    -

    Load balancer stickyness

    +

    Load balancer stickyness

    The balancer supports stickyness. When a request is proxied to some back-end, then all following requests from the same user @@ -114,7 +117,7 @@ itself. The URL encoding is usually done on the back-end.

    top
    -

    Examples of a balancer configuration

    +

    Examples of a balancer configuration

    Before we dive into the technical details, here's an example of how you might use mod_proxy_balancer to provide @@ -145,7 +148,7 @@ ProxyPassReverse "/test" "balancer://mycluster"

    top
    -

    Exported Environment Variables

    +

    Exported Environment Variables

    At present there are 6 environment variables exported:

    @@ -198,7 +201,7 @@ ProxyPassReverse "/test" "balancer://mycluster"
    top
    -

    Enabling Balancer Manager Support

    +

    Enabling Balancer Manager Support

    This module requires the service of mod_status. @@ -228,7 +231,7 @@ ProxyPassReverse "/test" "balancer://mycluster" containers can be dynamically controlled by the Manager.

    top
    -

    Details on load balancer stickyness

    +

    Details on load balancer stickyness

    When using cookie based stickyness, you need to configure the name of the cookie that contains the information about which back-end @@ -285,7 +288,7 @@ ProxyPassReverse "/test" "balancer://mycluster" for the same request, the information from the request parameter is used.

    top
    -

    Troubleshooting load balancer stickyness

    +

    Troubleshooting load balancer stickyness

    If you experience stickyness errors, e.g. users lose their application sessions and need to login again, you first want to diff --git a/docs/manual/mod/mod_proxy_balancer.xml.fr b/docs/manual/mod/mod_proxy_balancer.xml.fr index 32c5c43fea..c3bd858dd5 100644 --- a/docs/manual/mod/mod_proxy_balancer.xml.fr +++ b/docs/manual/mod/mod_proxy_balancer.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_proxy_balancer.xml.ja b/docs/manual/mod/mod_proxy_balancer.xml.ja index 131d04b258..32ca0da3eb 100644 --- a/docs/manual/mod/mod_proxy_balancer.xml.ja +++ b/docs/manual/mod/mod_proxy_balancer.xml.ja @@ -1,7 +1,7 @@ - + + diff --git a/docs/manual/mod/mod_slotmem_plain.xml.meta b/docs/manual/mod/mod_slotmem_plain.xml.meta index f15ceb5564..7d201ad377 100644 --- a/docs/manual/mod/mod_slotmem_plain.xml.meta +++ b/docs/manual/mod/mod_slotmem_plain.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_slotmem_shm.html.en b/docs/manual/mod/mod_slotmem_shm.html.en index 65d2210a57..78ce6f9c25 100644 --- a/docs/manual/mod/mod_slotmem_shm.html.en +++ b/docs/manual/mod/mod_slotmem_shm.html.en @@ -35,7 +35,7 @@

    Description:Path to read heartbeat data
    Syntax:HeartbeatStorage file-path
    Source File:mod_slotmem_shm.c

    Summary

    -

    mod_slotmem_shm is a memory provider which +

    mod_slotmem_shm is a memory provider which provides for creation and access to a shared memory segment in which the datasets are organized in "slots."

    @@ -49,52 +49,46 @@ DefaultRuntimeDir directive.

    -

    mod_slotmem_shm provides the following API functions: +

    mod_slotmem_shm provides the following API functions:

    -
    -
    apr_status_t doall(ap_slotmem_instance_t *s, ap_slotmem_callback_fn_t *func, void *data, apr_pool_t *pool)
    -
    call the callback on all worker slots
    +
    /* call the callback on all worker slots */
+apr_status_t doall(ap_slotmem_instance_t *s, ap_slotmem_callback_fn_t *func, void *data, apr_pool_t *pool)
 
-      
    apr_status_t create(ap_slotmem_instance_t **new, const char *name, apr_size_t item_size, unsigned int item_num, ap_slotmem_type_t type, apr_pool_t *pool)
    
-      
    create a new slotmem with each item size is item_size. name is used to generate a filename for the persistent store of
-      the shared memory if configured. Values are:
-       
    
-         
    "none"
    
-         
    Anonymous shared memory and no persistent store
    
-         
    "file-name"
    
-         
    [DefaultRuntimeDir]/file-name
    
-         
    "/absolute-file-name"
    
-         
    Absolute file name
    
-       
    
+/* create a new slotmem with each item size is item_size. 'name' is used to generate a filename for the persistent
+   store of the shared memory if configured. Values are:
+      "none"                - Anonymous shared memory and no persistent store
+      "file-name"           - [DefaultRuntimeDir]/file-name
+      "/absolute-file-name" - Absolute file name */
+apr_status_t create(ap_slotmem_instance_t **new, const char *name, apr_size_t item_size, unsigned int item_num, ap_slotmem_type_t type, apr_pool_t *pool)
 
-      
    apr_status_t attach(ap_slotmem_instance_t **new, const char *name, apr_size_t *item_size, unsigned int *item_num, apr_pool_t *pool)
    
-      
    attach to an existing slotmem. See create for description of name parameter.
    
+/* attach to an existing slotmem. See 'create()' for description of 'name' parameter */
+apr_status_t attach(ap_slotmem_instance_t **new, const char *name, apr_size_t *item_size, unsigned int *item_num, apr_pool_t *pool)
 
-      
    apr_status_t dptr(ap_slotmem_instance_t *s, unsigned int item_id, void**mem)
    
-      
    get the direct pointer to the memory associated with this worker slot.
    
+/* get the direct pointer to the memory associated with this worker slot */
+apr_status_t dptr(ap_slotmem_instance_t *s, unsigned int item_id, void **mem)
 
-      
    apr_status_t get(ap_slotmem_instance_t *s, unsigned int item_id, unsigned char *dest, apr_size_t dest_len)
    
-      
    get/read the memory from this slot to dest
    
+/* get/read the memory from this slot to dest */
+apr_status_t get(ap_slotmem_instance_t *s, unsigned int item_id, unsigned char *dest, apr_size_t dest_len)
 
-      
    apr_status_t put(ap_slotmem_instance_t *slot, unsigned int item_id, unsigned char *src, apr_size_t src_len)
    
-      
    put/write the data from src to this slot
    
+/* put/write the data from src to this slot */
+apr_status_t put(ap_slotmem_instance_t *slot, unsigned int item_id, unsigned char *src, apr_size_t src_len)
 
-      
    unsigned int num_slots(ap_slotmem_instance_t *s)
    
-      
    return the total number of slots in the segment
    
+/* return the total number of slots in the segment */
+unsigned int num_slots(ap_slotmem_instance_t *s)
 
-      
    apr_size_t slot_size(ap_slotmem_instance_t *s)
    
-      
    return the total data size, in bytes, of a slot in the segment
    
+/* return the total data size, in bytes, of a slot in the segment */
+apr_size_t slot_size(ap_slotmem_instance_t *s)
 
-      
    apr_status_t grab(ap_slotmem_instance_t *s, unsigned int *item_id);
    
-      
    grab or allocate the first free slot and mark as in-use (does not do any data copying)
    
+/* grab or allocate the first free slot and mark as in-use (does not do any data copying) */
+apr_status_t grab(ap_slotmem_instance_t *s, unsigned int *item_id)
 
-      
    apr_status_t fgrab(ap_slotmem_instance_t *s, unsigned int item_id);
    
-      
    forced grab or allocate the specified slot and mark as in-use (does not do any data copying)
    
+/* forced grab or allocate the specified slot and mark as in-use (does not do any data copying) */
+apr_status_t fgrab(ap_slotmem_instance_t *s, unsigned int item_id)
+
+/* release or free a slot and mark as not in-use (does not do any data copying) */
+apr_status_t release(ap_slotmem_instance_t *s, unsigned int item_id)
    -
    apr_status_t release(ap_slotmem_instance_t *s, unsigned int item_id);
    -
    release or free a slot and mark as not in-use (does not do any data copying)
    -

    Directives

    diff --git a/docs/manual/mod/mod_slotmem_shm.xml.fr b/docs/manual/mod/mod_slotmem_shm.xml.fr index c4bdb14629..af76f72d2f 100644 --- a/docs/manual/mod/mod_slotmem_shm.xml.fr +++ b/docs/manual/mod/mod_slotmem_shm.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_slotmem_shm.xml.meta b/docs/manual/mod/mod_slotmem_shm.xml.meta index ec491332e7..8fe92a664e 100644 --- a/docs/manual/mod/mod_slotmem_shm.xml.meta +++ b/docs/manual/mod/mod_slotmem_shm.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_usertrack.html.en b/docs/manual/mod/mod_usertrack.html.en index 4d6b7f1e4c..c1f5e3f386 100644 --- a/docs/manual/mod/mod_usertrack.html.en +++ b/docs/manual/mod/mod_usertrack.html.en @@ -56,7 +56,7 @@
  • Comments
    • top
    -

    Logging

    +

    Logging

    mod_usertrack sets a cookie which can be logged @@ -68,7 +68,7 @@ CustomLog "logs/clickstream.log" usertrack

    top
    -

    CookieDomain Directive

    +

    CookieDomain Directive

    @@ -104,7 +104,7 @@ CustomLog "logs/clickstream.log" usertrack
    top
    -

    CookieExpires Directive

    +

    CookieExpires Directive

    Description:The domain to which the tracking cookie applies
    Syntax:CookieDomain domain
    @@ -129,7 +129,7 @@ CustomLog "logs/clickstream.log" usertrack
    top
    -

    CookieName Directive

    +

    CookieName Directive

    Description:Expiry time for the tracking cookie
    Syntax:CookieExpires expiry-period
    @@ -152,11 +152,11 @@ CustomLog "logs/clickstream.log" usertrack
    top
    -

    CookieStyle Directive

    +

    CookieStyle Directive

    Description:Name of the tracking cookie
    Syntax:CookieName token
    + Netscape|Cookie|Cookie2|RFC2109|RFC2965 @@ -189,7 +189,7 @@ CustomLog "logs/clickstream.log" usertrack
    top
    -

    CookieTracking Directive

    +

    CookieTracking Directive

    Description:Format of the cookie header field
    Syntax:CookieStyle - Netscape|Cookie|Cookie2|RFC2109|RFC2965
    Default:CookieStyle Netscape
    Context:server config, virtual host, directory, .htaccess
    Override:FileInfo
    diff --git a/docs/manual/mod/mod_usertrack.xml.fr b/docs/manual/mod/mod_usertrack.xml.fr index 0791ac78ea..071da122ee 100644 --- a/docs/manual/mod/mod_usertrack.xml.fr +++ b/docs/manual/mod/mod_usertrack.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_usertrack.xml.meta b/docs/manual/mod/mod_usertrack.xml.meta index 8a7ae2254a..9b19825b7b 100644 --- a/docs/manual/mod/mod_usertrack.xml.meta +++ b/docs/manual/mod/mod_usertrack.xml.meta @@ -8,6 +8,6 @@ en - fr + fr -- 2.50.1
    Description:Enables tracking cookie
    Syntax:CookieTracking on|off