From cf2eb9eeec9206fd49ba538e057fe426e9c16bea Mon Sep 17 00:00:00 2001 From: "Alan M. Carroll" Date: Fri, 24 Jul 2020 10:23:07 -0500 Subject: [PATCH 1/2] Doc: fix build errors. --- doc/admin-guide/plugins/icap.en.rst | 1 + doc/admin-guide/plugins/memory_profile.en.rst | 2 ++ 2 files changed, 3 insertions(+) diff --git a/doc/admin-guide/plugins/icap.en.rst b/doc/admin-guide/plugins/icap.en.rst index 34a41dade75..d3f60326ebf 100644 --- a/doc/admin-guide/plugins/icap.en.rst +++ b/doc/admin-guide/plugins/icap.en.rst @@ -1,4 +1,5 @@ .. _icap-plugin: +.. include:: ../../common.defs ICAP Plugin *********** diff --git a/doc/admin-guide/plugins/memory_profile.en.rst b/doc/admin-guide/plugins/memory_profile.en.rst index 254ec8d2df5..1feaf2e8bfe 100644 --- a/doc/admin-guide/plugins/memory_profile.en.rst +++ b/doc/admin-guide/plugins/memory_profile.en.rst @@ -1,3 +1,5 @@ +.. include:: ../../common.defs + Memory_profile Plugin ********************* From 6c59d330dbd1483cb794f200d61df8236127fa66 Mon Sep 17 00:00:00 2001 From: "Alan M. Carroll" Date: Fri, 24 Jul 2020 11:16:25 -0500 Subject: [PATCH 2/2] Doc: add cross referencing to server session sharing match vs. connection tracking match. --- doc/admin-guide/files/records.config.en.rst | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/admin-guide/files/records.config.en.rst b/doc/admin-guide/files/records.config.en.rst index 2afcbf08530..b97ad5238b3 100644 --- a/doc/admin-guide/files/records.config.en.rst +++ b/doc/admin-guide/files/records.config.en.rst @@ -975,9 +975,15 @@ mptcp .. note:: - Server sessions to different ports never match even if the FQDN and IP + Server sessions to different upstream ports never match even if the FQDN and IP address match. +.. note:: + + :ts:cv:`Upstream session tracking ` uses a similar + set of options for matching sessions, but is :ts:cv:`set independently + ` from session sharing. + .. ts:cv:: CONFIG proxy.config.http.server_session_sharing.pool STRING thread Control the scope of server session re-use if it is enabled by @@ -1504,6 +1510,11 @@ Origin Server Connect Attempts To disable upstream server grouping, set :ts:cv:`proxy.config.http.per_server.connection.max` to ``0``. +.. note:: + + This setting is independent of the :ts:cv:`setting for upstream session sharing matching + `. + .. ts:cv:: CONFIG proxy.config.http.per_server.connection.queue_size INT 0 :reloadable: