From: Luca Toscano
Date: Sun, 29 Apr 2018 06:06:52 +0000 (+0000)
Subject: documentation rebuild
X-Git-Tag: 2.4.34~184
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8af8d1f641f013b2ff1c30542b44362098927957;p=apache
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1830491 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en
index 20a6a28c56..f699716a4c 100644
--- a/docs/manual/mod/mod_authz_core.html.en
+++ b/docs/manual/mod/mod_authz_core.html.en
@@ -98,12 +98,12 @@
Alias "/secure" "/webpages/secure"
<Directory "/webpages/secure">
Require all granted
-
+
AuthBasicProvider file
-
+
AuthType Basic
AuthName LDAP_Protected_Place
-
+
#implied OR operation
Require ldap-group-alias1
Require ldap-group-alias2
@@ -186,12 +186,12 @@ Alias "/secure" "/webpages/secure"
with KnockKnock/2.0
will be allowed access, and all
others will be denied.
- When the server looks up a path via an internal
- subrequest such as looking
- for a DirectoryIndex
+
When the server looks up a path via an internal
+ subrequest such as looking
+ for a DirectoryIndex
or generating a directory listing with mod_autoindex
,
- per-request environment variables are not inherited in the
- subrequest. Additionally,
+ per-request environment variables are not inherited in the
+ subrequest. Additionally,
SetEnvIf
directives
are not separately evaluated in the subrequest due to the API phases
mod_setenvif
takes action in.
@@ -249,7 +249,7 @@ Alias "/secure" "/webpages/secure"
<RequireAll>
Require expr "!(%{QUERY_STRING} =~ /secret/)"
- Require expr "%{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"
+ Require expr "%{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"
</RequireAll>
@@ -257,7 +257,8 @@ Alias "/secure" "/webpages/secure"
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
@@ -505,12 +506,12 @@ Require group admin
Security Warning
Exercise caution when setting authorization directives in
Location
sections
- that overlap with content served out of the filesystem.
+ that overlap with content served out of the filesystem.
By default, these configuration sections overwrite authorization configuration
- in Directory
,
+ in Directory
,
and Files
sections.
-
The AuthMerging
directive
- can be used to control how authorization configuration sections are
+
The AuthMerging
directive
+ can be used to control how authorization configuration sections are
merged.
diff --git a/docs/manual/mod/mod_lbmethod_byrequests.html.en b/docs/manual/mod/mod_lbmethod_byrequests.html.en
index ed1113b976..66e52bc12c 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
diff --git a/docs/manual/mod/mod_lbmethod_bytraffic.html.en b/docs/manual/mod/mod_lbmethod_bytraffic.html.en
index 49bf7a4e7f..f762bff209 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
diff --git a/docs/manual/mod/mod_lbmethod_heartbeat.html.en b/docs/manual/mod/mod_lbmethod_heartbeat.html.en
index bac98b13ae..68ee558aa7 100644
--- a/docs/manual/mod/mod_lbmethod_heartbeat.html.en
+++ b/docs/manual/mod/mod_lbmethod_heartbeat.html.en
@@ -36,12 +36,12 @@
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)
-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
+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_balancer.html.en b/docs/manual/mod/mod_proxy_balancer.html.en
index 4622fd6380..44b508c483 100644
--- a/docs/manual/mod/mod_proxy_balancer.html.en
+++ b/docs/manual/mod/mod_proxy_balancer.html.en
@@ -90,9 +90,12 @@
-
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.
@@ -126,7 +129,7 @@
BalancerMember "http://192.168.1.50:80"
BalancerMember "http://192.168.1.51:80"
</Proxy>
-ProxyPass "/test" "balancer://mycluster"
+ProxyPass "/test" "balancer://mycluster"
ProxyPassReverse "/test" "balancer://mycluster"
@@ -141,7 +144,7 @@ ProxyPassReverse "/test" "balancer://mycluster"
BalancerMember "http://192.168.1.51:80" route=2
ProxySet stickysession=ROUTEID
</Proxy>
-ProxyPass "/test" "balancer://mycluster"
+ProxyPass "/test" "balancer://mycluster"
ProxyPassReverse "/test" "balancer://mycluster"

diff --git a/docs/manual/mod/mod_slotmem_plain.html.en b/docs/manual/mod/mod_slotmem_plain.html.en
index fa63cdae00..1a76f8021d 100644
--- a/docs/manual/mod/mod_slotmem_plain.html.en
+++ b/docs/manual/mod/mod_slotmem_plain.html.en
@@ -35,7 +35,7 @@
SourceĀ File: | mod_slotmem_plain.c |
Summary
-
mod_slotmem_plain
is a memory provider which
+
mod_slotmem_plain
is a memory provider which
provides for creation and access to a plain memory segment
in which the datasets are organized in "slots."
@@ -45,43 +45,42 @@
mod_slotmem_shm
.
-
mod_slotmem_plain
provides the following API functions:
+
mod_slotmem_plain
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.
+/* create a new slotmem with each item size is item_size */
+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.
+/* attach to an existing slotmem */
+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)
+
+/* 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 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)
-
- - 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.html.en b/docs/manual/mod/mod_slotmem_shm.html.en
index 6521407fef..ccab2d4213 100644
--- a/docs/manual/mod/mod_slotmem_shm.html.en
+++ b/docs/manual/mod/mod_slotmem_shm.html.en
@@ -35,7 +35,7 @@
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_usertrack.html.en b/docs/manual/mod/mod_usertrack.html.en
index 4ca027e1b8..b212747377 100644
--- a/docs/manual/mod/mod_usertrack.html.en
+++ b/docs/manual/mod/mod_usertrack.html.en
@@ -63,7 +63,7 @@
via
mod_log_config
configurable logging formats:
LogFormat "%{Apache}n %r %t" usertrack
-CustomLog logs/clickstream.log usertrack
+CustomLog "logs/clickstream.log" usertrack
@@ -156,7 +156,7 @@ CustomLog logs/clickstream.log usertrack
Description: | Format of the cookie header field |
Syntax: | CookieStyle
- Netscape|Cookie|Cookie2|RFC2109|RFC2965 |
+ Netscape|Cookie|Cookie2|RFC2109|RFC2965
Default: | CookieStyle Netscape |
Context: | server config, virtual host, directory, .htaccess |
Override: | FileInfo |
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index a028d8b11e..7227967cc0 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -351,7 +351,7 @@ headers
CookieExpires expiry-period | | svdh | E |
Expiry time for the tracking cookie |
CookieName token | Apache | svdh | E |
Name of the tracking cookie |
CookieStyle
- Netscape|Cookie|Cookie2|RFC2109|RFC2965 | Netscape | svdh | E |
Format of the cookie header field |
+ Netscape|Cookie|Cookie2|RFC2109|RFC2965 Netscape | svdh | E | Format of the cookie header field |
CookieTracking on|off | off | svdh | E |
Enables tracking cookie |
CoreDumpDirectory directory | | s | M |
Directory where Apache HTTP Server attempts to
switch before dumping core |
diff --git a/docs/manual/programs/rotatelogs.html.en b/docs/manual/programs/rotatelogs.html.en
index 43895f957d..347bb2128f 100644
--- a/docs/manual/programs/rotatelogs.html.en
+++ b/docs/manual/programs/rotatelogs.html.en
@@ -47,6 +47,7 @@
[ -L linkname ]
[ -p program ]
[ -f ]
+ [ -D ]
[ -t ]
[ -v ]
[ -e ]
@@ -93,6 +94,11 @@ 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
+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.
+
-t
Causes the logfile to be truncated instead of rotated. This is
useful when a log is processed in real time by a command like tail,