From 15057920b153d86239dac2eec2f43f376a213117 Mon Sep 17 00:00:00 2001 From: Luca Toscano Date: Sat, 9 Sep 2017 09:31:42 +0000 Subject: [PATCH] Documentation rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1807870 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/event.html.en | 2 +- docs/manual/mod/event.xml.fr | 2 +- docs/manual/mod/mod_ssl.html.en | 24 +++++++++++++++++------- docs/manual/mod/mod_ssl.xml.fr | 2 +- docs/manual/mod/mod_ssl.xml.meta | 2 +- docs/manual/mod/quickreference.html.en | 2 +- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/docs/manual/mod/event.html.en b/docs/manual/mod/event.html.en index ba8cc50221..07a203b1f5 100644 --- a/docs/manual/mod/event.html.en +++ b/docs/manual/mod/event.html.en @@ -143,7 +143,7 @@ of the AsyncRequestWorkerFactor.

The above connection states are managed by the listener thread via dedicated queues, that up to 2.4.27 were checked every 100ms to find which connections hit timeout settings like Timeout and KeepAliveTimeout. This was a simple and efficient solution, but it presented a downside: the pollset was - forcing a wake-up of the listener thread even if there was no need (for example because completely idle), wasting resources. From 2.4.27 + forcing a wake-up of the listener thread even if there was no need (for example because completely idle), wasting resources. From 2.4.28 these queues are completely managed via an event based logic, not relying anymore on active polling. Resource constrained environments, like embedded servers, may benefit from this improvement.

diff --git a/docs/manual/mod/event.xml.fr b/docs/manual/mod/event.xml.fr index 8c45ffa30d..ec5500b79f 100644 --- a/docs/manual/mod/event.xml.fr +++ b/docs/manual/mod/event.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index 6f040627f1..180ef3861d 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -950,15 +950,16 @@ SSLCryptoDevice ubsec

SSLEngine Directive

- + +
Description:SSL Engine Operation Switch
Syntax:SSLEngine on|off|optional
Syntax:SSLEngine on|off|optional|addr[:port] [addr[:port]] ...
Default:SSLEngine off
Context:server config, virtual host
Status:Extension
Module:mod_ssl
Compatibility:The addr:port parameter is available in Apache 2.4.28 and later.

-This directive toggles the usage of the SSL/TLS Protocol Engine. This -is should be used inside a <VirtualHost> section to enable SSL/TLS for a +This directive toggles the usage of the SSL/TLS Protocol Engine. Values 'on', +'off' and 'optional' should be used inside a <VirtualHost> section to enable SSL/TLS for a that virtual host. By default the SSL/TLS Protocol Engine is disabled for both the main server and all configured virtual hosts.

Example

<VirtualHost _default_:443>
@@ -966,10 +967,19 @@ SSLEngine on
 #...
 </VirtualHost>
-

In Apache 2.1 and later, SSLEngine can be set to -optional. This enables support for -RFC 2817, Upgrading to TLS -Within HTTP/1.1. At this time no web browsers support RFC 2817.

+

The addr:port values should be used in the +global server to enable the SSL/TLS Protocol Engine for all +<VirtualHost>s +that match one of the addresses in the list.

+

Example

SSLEngine *:443
+<VirtualHost *:443>
+#...
+</VirtualHost>
+
+

SSLEngine can be set to optional: +this enables support for +RFC 2817. +

top
diff --git a/docs/manual/mod/mod_ssl.xml.fr b/docs/manual/mod/mod_ssl.xml.fr index 743fffaa98..27e4d709d7 100644 --- a/docs/manual/mod/mod_ssl.xml.fr +++ b/docs/manual/mod/mod_ssl.xml.fr @@ -1,7 +1,7 @@ - +