From bff39090cde5c0055ff7a32a02186d52270af128 Mon Sep 17 00:00:00 2001
From: Christophe Jaillet
Date: Thu, 10 Apr 2014 21:07:08 +0000
Subject: [PATCH] Add notes for changes made in version 2.4.4 +
synch formating with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1586471 13f79535-47bb-0310-9956-ffa450edef68
---
docs/manual/mod/mod_dir.xml | 16 +++++++++-------
docs/manual/mod/mod_headers.xml | 13 ++++++++-----
docs/manual/mod/mod_proxy.xml | 9 ++++-----
docs/manual/mod/mod_ssl.xml | 5 +++++
4 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/docs/manual/mod/mod_dir.xml b/docs/manual/mod/mod_dir.xml
index dc855bd234..f9384bdcb7 100644
--- a/docs/manual/mod/mod_dir.xml
+++ b/docs/manual/mod/mod_dir.xml
@@ -149,14 +149,14 @@ a directory
>DirectoryIndexRedirect causes an external redirect
to instead be issued.
- The argument can be :
+ The argument can be:
- on
: issues a 302 redirection to the index resource.
- off
: does not issue a redirection. This is the legacy behaviour of mod_dir.
- permanent
: issues a 301 (permanent) redirection to the index resource.
- temp
: this has the same effect as on
- seeother
: issues a 303 redirection (also known as "See Other") to the index resource.
- - 3xx-code : issues a redirection marked by the chosen 3xx code.
+ on
: issues a 302 redirection to the index resource.
+ off
: does not issue a redirection. This is the legacy behaviour of mod_dir.
+ permanent
: issues a 301 (permanent) redirection to the index resource.
+ temp
: this has the same effect as on
+ seeother
: issues a 303 redirection (also known as "See Other") to the index resource.
+ - 3xx-code: issues a redirection marked by the chosen 3xx code.
@@ -237,6 +237,8 @@ a directory
server configvirtual host
directory.htaccess
Indexes
+The disabled
argument is available in version 2.4.4 and
+later
Use this to set a handler for any URL that doesn't map to anything
in your filesystem, and would otherwise return HTTP 404 (Not Found).
diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index 3115ed0cc5..d090b18e79 100644
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -256,7 +256,7 @@ Header merge Cache-Control no-store env=NO_STORE
set
The request header is set, replacing any previous header
with this name
-
+
setifempty
The request header is set, but only if there is no previous header
with this name. Available in 2.4.7 and later.
@@ -308,7 +308,7 @@ Header merge Cache-Control no-store env=NO_STORE
Header
Configure HTTP response headers
-Header [condition] add|append|echo|edit|edit*|merge|set|unset|note
+Header [condition] add|append|echo|edit|edit*|merge|set|setifempty|unset|note
header [[expr=]value]] [replacement]
[early|env=[!]variable]|expr=expression]
@@ -462,17 +462,20 @@ Header merge Cache-Control no-store env=NO_STORE
designed to expose the values obtained by getloadavg()
and this represents the current load average, the 5 minute average, and
the 15 minute average. The value is preceded by l=
with each
- average separated by /
.
+ average separated by /
.
+ Available in 2.4.4 and later.
%i |
The current idle percentage of httpd (0 to 100) based on available
- processes and threads. The value is preceded by i= .
+ processes and threads. The value is preceded by i= .
+ Available in 2.4.4 and later.
|
%b |
The current busy percentage of httpd (0 to 100) based on available
- processes and threads. The value is preceded by b= .
+ processes and threads. The value is preceded by b= .
+ Available in 2.4.4 and later.
|
%{VARNAME}e |
diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 1b77507f0e..26a8bf89ce 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -700,8 +700,7 @@ expressions
BalancerPersist On|Off
BalancerPersist Off
server configvirtual host
- BalancerPersist is only available in Apache HTTP Server 2.5.0
- and later.
+ BalancerPersist is only available in Apache HTTP Server 2.4.4 and later.
This directive will cause the shared memory storage associated
with the balancers and balancer members to be persisted across
@@ -735,8 +734,7 @@ expressions
BalancerInherit On|Off
BalancerInherit On
server configvirtual host
- BalancerInherit is only available in Apache HTTP Server 2.4.4 and later.
- and later.
+ BalancerInherit is only available in Apache HTTP Server 2.4.5 and later.
This directive will cause the current server/vhost to "inherit"
Balancers and Workers defined in the main server. This can cause issues and
@@ -1176,7 +1174,8 @@ ProxyPass /mirror/foo http://backend.example.com
and it depends on the backend application server that support sessions.
If the backend application server uses different name for cookies
and url encoded id (like servlet containers) use | to to separate them.
- The first part is for the cookie the second for the path.
+ The first part is for the cookie the second for the path.
+ Available in Apache HTTP Server 2.4.4 and later.
stickysessionsep |
"." |
diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index e6cb407506..2f4a6cfb17 100644
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1248,6 +1248,9 @@ SSLVerifyDepth 10
SSLSRPVerifierFile file-path
server config
virtual host
+Available in httpd 2.4.4 and later, if using OpenSSL 1.0.1 or
+later
+
@@ -1275,6 +1278,8 @@ avalable in the SSL_SRP_USERINFO
request environment variable.
SSLSRPUnknownUserSeed secret-string
server config
virtual host
+Available in httpd 2.4.4 and later, if using OpenSSL 1.0.1 or
+later
--
2.40.0