DH parameter interoperability with primes > 1024 bit
-Beginning with version 2.5.0-dev as of 2013-09-29, mod_ssl makes use of
-standardized DH parameters with prime lengths of 2048, 3072 and 4096 bits
+Beginning with version 2.5.0-dev, mod_ssl makes use of
+standardized DH parameters with prime lengths of 2048, 3072 and 4096, 6144 and 8192 bits
(from RFC 3526), and hands
them out to clients based on the length of the certificate's RSA/DSA key.
With Java-based clients in particular (Java 7 or earlier), this may lead
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index ca9ea569404..54bbe03c6cb 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -630,7 +630,7 @@ regul
| LuaCodeCache stat|forever|never | stat | svdh | X |
| Configure the compiled code cache. |
| LuaHookAccessChecker /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the access_checker phase of request processing |
| LuaHookAuthChecker /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the auth_checker phase of request processing |
-
| LuaHookCheckUserID /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the check_user_id phase of request processing |
+
| LuaHookCheckUserID /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the check_user_id phase of request processing |
| LuaHookFixups /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the fixups phase of a request
processing |
| LuaHookInsertFilter /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the insert_filter phase of request processing |
diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
index 47dfdea1519..1bb5a2db7fb 100644
--- a/docs/manual/mod/quickreference.html.es
+++ b/docs/manual/mod/quickreference.html.es
@@ -632,7 +632,7 @@ matching URLs
| LuaCodeCache stat|forever|never | stat | svdh | X |
| Configure the compiled code cache. |
| LuaHookAccessChecker /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the access_checker phase of request processing |
| LuaHookAuthChecker /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the auth_checker phase of request processing |
-
| LuaHookCheckUserID /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the check_user_id phase of request processing |
+
| LuaHookCheckUserID /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the check_user_id phase of request processing |
| LuaHookFixups /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the fixups phase of a request
processing |
| LuaHookInsertFilter /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the insert_filter phase of request processing |
diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8
index 74b55e5336b..59e48055830 100644
--- a/docs/manual/mod/quickreference.html.ja.utf8
+++ b/docs/manual/mod/quickreference.html.ja.utf8
@@ -592,7 +592,7 @@ Certificate Authority or global client certificates
| LuaCodeCache stat|forever|never | stat | svdh | X |
| Configure the compiled code cache. |
| LuaHookAccessChecker /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the access_checker phase of request processing |
| LuaHookAuthChecker /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the auth_checker phase of request processing |
-
| LuaHookCheckUserID /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the check_user_id phase of request processing |
+
| LuaHookCheckUserID /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the check_user_id phase of request processing |
| LuaHookFixups /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the fixups phase of a request
processing |
| LuaHookInsertFilter /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the insert_filter phase of request processing |
diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr
index 23a486a40ba..a5a6e1515f4 100644
--- a/docs/manual/mod/quickreference.html.ko.euc-kr
+++ b/docs/manual/mod/quickreference.html.ko.euc-kr
@@ -593,7 +593,7 @@ matching URLs
| LuaCodeCache stat|forever|never | stat | svdh | X |
| Configure the compiled code cache. |
| LuaHookAccessChecker /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the access_checker phase of request processing |
| LuaHookAuthChecker /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the auth_checker phase of request processing |
-
| LuaHookCheckUserID /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the check_user_id phase of request processing |
+
| LuaHookCheckUserID /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the check_user_id phase of request processing |
| LuaHookFixups /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the fixups phase of a request
processing |
| LuaHookInsertFilter /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the insert_filter phase of request processing |
diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8
index 24db0bb84ae..28dcee59b7c 100644
--- a/docs/manual/mod/quickreference.html.tr.utf8
+++ b/docs/manual/mod/quickreference.html.tr.utf8
@@ -626,7 +626,7 @@ uygulanır.
| LuaCodeCache stat|forever|never | stat | skdh | D |
| Configure the compiled code cache. |
| LuaHookAccessChecker /path/to/lua/script.lua hook_function_name [early|late] | | skdh | D |
| Provide a hook for the access_checker phase of request processing |
| LuaHookAuthChecker /path/to/lua/script.lua hook_function_name [early|late] | | skdh | D |
| Provide a hook for the auth_checker phase of request processing |
-
| LuaHookCheckUserID /path/to/lua/script.lua hook_function_name [early|late] | | skdh | D |
| Provide a hook for the check_user_id phase of request processing |
+
| LuaHookCheckUserID /path/to/lua/script.lua hook_function_name | | skdh | D |
| Provide a hook for the check_user_id phase of request processing |
| LuaHookFixups /path/to/lua/script.lua hook_function_name | | skdh | D |
| Provide a hook for the fixups phase of a request
processing |
| LuaHookInsertFilter /path/to/lua/script.lua hook_function_name | | skdh | D |
| Provide a hook for the insert_filter phase of request processing |
diff --git a/docs/manual/mod/quickreference.html.zh-cn.utf8 b/docs/manual/mod/quickreference.html.zh-cn.utf8
index 2d4e5bc758d..674e691fc53 100644
--- a/docs/manual/mod/quickreference.html.zh-cn.utf8
+++ b/docs/manual/mod/quickreference.html.zh-cn.utf8
@@ -620,7 +620,7 @@ matching URLs
| LuaCodeCache stat|forever|never | stat | svdh | X |
| Configure the compiled code cache. |
| LuaHookAccessChecker /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the access_checker phase of request processing |
| LuaHookAuthChecker /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the auth_checker phase of request processing |
-
| LuaHookCheckUserID /path/to/lua/script.lua hook_function_name [early|late] | | svdh | X |
| Provide a hook for the check_user_id phase of request processing |
+
| LuaHookCheckUserID /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the check_user_id phase of request processing |
| LuaHookFixups /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the fixups phase of a request
processing |
| LuaHookInsertFilter /path/to/lua/script.lua hook_function_name | | svdh | X |
| Provide a hook for the insert_filter phase of request processing |
diff --git a/docs/manual/programs/ab.html.en b/docs/manual/programs/ab.html.en
index edc84ad3cea..24d35d987a4 100644
--- a/docs/manual/programs/ab.html.en
+++ b/docs/manual/programs/ab.html.en
@@ -55,6 +55,7 @@
[ -
i ]
[ -
k ]
[ -
l ]
+ [ -
m HTTP-method ]
[ -
n requests ]
[ -
p POST-file ]
[ -
P proxy-auth-username:
password ]
@@ -110,7 +111,8 @@
'gnuplot' file; as the results are already 'binned'.
-f protocol
-
Specify SSL/TLS protocol (SSL2, SSL3, TLS1, or ALL).
+
Specify SSL/TLS protocol (SSL2, SSL3, TLS1, TLS1.1, TLS1.2, or ALL).
+ TLS1.1 and TLS1.2 support available in 2.4.4 and later.
-g gnuplot-file
Write all measured values out as a 'gnuplot' or TSV (Tab separate
@@ -135,9 +137,14 @@
-l
Do not report errors if the length of the responses is not constant. This
- can be usefull for dynamic pages.
+ can be usefull for dynamic pages.
+ Available in 2.4.7 and later.
+
-m HTTP-method
+
Custom HTTP method for the requests.
+ Available in 2.4.10 and later.
+
-n requests
Number of requests to perform for the benchmarking session. The default
is to just perform a single request which usually leads to
@@ -163,7 +170,8 @@
-s timeout
Maximum number of seconds to wait before the socket times out.
- Default is 30 seconds.
+ Default is 30 seconds.
+ Available in 2.4.4 and later.
-S
Do not display the median and standard deviation values, nor display