diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2020-07-16 10:44:41 -0400 |
|---|---|---|
| committer | Ashod Nakashian <ash@collabora.com> | 2020-08-11 20:11:14 +0200 |
| commit | c5f9d605e433701680a533fa20a3390f1e7ff5eb (patch) | |
| tree | a10f4f17fc2b0efb2eabee1ded5766a2071f3366 /loolwsd.xml.in | |
| parent | leaflet: copy the reuse_cookies param from URI to map.options (diff) | |
| download | online-c5f9d605e433701680a533fa20a3390f1e7ff5eb.tar.gz online-c5f9d605e433701680a533fa20a3390f1e7ff5eb.zip | |
wsd: make outgoing connection timeout configurable
The default Poco connection timeout is 60 seconds,
which is probably excessive. The current configurable
default is a more reasonable 30 seconds.
Currently we set this timeout on Storage connections
going out (i.e. WOPI connections).
Change-Id: Ie80a9141ca9bf721addc74baf94e62e0ad72fdd2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98913
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Ashod Nakashian <ash@collabora.com>
Diffstat (limited to 'loolwsd.xml.in')
| -rw-r--r-- | loolwsd.xml.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/loolwsd.xml.in b/loolwsd.xml.in index ceb78992ee..f1235d6180 100644 --- a/loolwsd.xml.in +++ b/loolwsd.xml.in @@ -99,6 +99,7 @@ <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.17\.[0-9]{1,3}\.[0-9]{1,3}</host> </post_allow> <frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (loolwsd and WOPI host are always allowed). Separate multiple hosts by space."></frame_ancestors> + <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by loolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs> </net> <ssl desc="SSL settings"> |