From 95b3479de76f25aa534433d53a8a251f2a4ff22c Mon Sep 17 00:00:00 2001 From: Luca Toscano Date: Mon, 22 Feb 2016 07:18:35 +0000 Subject: [PATCH] Documentation rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1731595 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/event.xml.fr | 2 +- docs/manual/mod/mod_proxy_balancer.html.en | 28 +++++++++++++--------- docs/manual/mod/mod_proxy_wstunnel.html.en | 14 ++++++----- docs/manual/mod/quickreference.html.en | 2 +- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/docs/manual/mod/event.xml.fr b/docs/manual/mod/event.xml.fr index 9277c9df72..cc115eb9ba 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_proxy_balancer.html.en b/docs/manual/mod/mod_proxy_balancer.html.en index a6e9d7df70..a8d30ec4d2 100644 --- a/docs/manual/mod/mod_proxy_balancer.html.en +++ b/docs/manual/mod/mod_proxy_balancer.html.en @@ -37,17 +37,23 @@ Compatibility:Available in version 2.1 and later

Summary

-

This module requires the service of mod_proxy. It provides load balancing support for - HTTP, FTP and AJP13 protocols -

- -

Load balancing scheduler algorithm is provided by not this - module but other modules such as: - mod_lbmethod_byrequests, - mod_lbmethod_bytraffic, - mod_lbmethod_bybusyness and - mod_lbmethod_heartbeat. -

+

This module requires the service of mod_proxy and it provides load balancing for + all the supported protocols. The most important ones are:

+ + +

The Load balancing scheduler algorithm is not provided by this + module but from other ones such as:

+

Thus, in order to get the ability of load balancing, mod_proxy, mod_proxy_balancer diff --git a/docs/manual/mod/mod_proxy_wstunnel.html.en b/docs/manual/mod/mod_proxy_wstunnel.html.en index ec672586bf..a3f6f4f129 100644 --- a/docs/manual/mod/mod_proxy_wstunnel.html.en +++ b/docs/manual/mod/mod_proxy_wstunnel.html.en @@ -38,17 +38,19 @@

This module requires the service of mod_proxy. It provides support for the tunnelling of web socket connections to a backend websockets server. The connection - is automagically upgraded to a websocket connection:

+ is automatically upgraded to a websocket connection:

- 
Upgrade: WebSocket
+    
HTTP Response
Upgrade: WebSocket
 Connection: Upgrade

+

 
-
-
-    
Proxying requests to websockets server
ProxyPass "/ws2/"  "ws://echo.websocket.org/"
+
Proxying requests to a websockets server like echo.websocket.org can be done using the
+ProxyPass directive:

+    
ProxyPass "/ws2/"  "ws://echo.websocket.org/"
 ProxyPass "/wss2/" "wss://echo.websocket.org/"

-

 
+
+
Load balancing for multiple backends can be achieved using mod_proxy_balancer.

 
 
Directives

 
This module provides no
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 911a094363..08e69b29eb 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -677,7 +677,7 @@ using the specified magic file
 MinSpareThreads numbersMMinimum number of idle threads available to handle request
 spikes
 MMapFile file-path [file-path] ...sXMap a list of files into memory at startup time
-ModemStandard V.21|V.26bis|V.32|V.92dXModem standard to simulate
+ModemStandard V.21|V.26bis|V.32|V.34|V.92dXModem standard to simulate
 ModMimeUsePathInfo On|Off Off dBTells mod_mime to treat path_info
 components as part of the filename
 MultiviewsMatch Any|NegotiatedOnly|Filters|Handlers
-- 
2.40.0