summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-11-15 13:06:41 +0000
committerGitHub <noreply@github.com>2018-11-15 13:06:41 +0000
commitb5d92d4d4617447e6352dc34d13872c0a752c8c5 (patch)
tree00cfd30d07634892786260a0ae678d4c45a4730f
parentMerge pull request #4184 from matrix-org/rav/fix_public_consent (diff)
parentUpdate README for #1491 fix (diff)
downloadsynapse-b5d92d4d4617447e6352dc34d13872c0a752c8c5.tar.xz
Merge pull request #4188 from matrix-org/rav/readme-update-1
Update README for #1491 fix
-rw-r--r--README.rst7
-rw-r--r--changelog.d/4188.misc1
2 files changed, 5 insertions, 3 deletions
diff --git a/README.rst b/README.rst
index 9165db8319..a74fd6d9c1 100644
--- a/README.rst
+++ b/README.rst
@@ -729,9 +729,10 @@ port:
 
   .. __: `key_management`_
 
-* Synapse does not currently support SNI on the federation protocol
-  (`bug #1491 <https://github.com/matrix-org/synapse/issues/1491>`_), which
-  means that using name-based virtual hosting is unreliable.
+* Until v0.33.3, Synapse did not support SNI on the federation port
+  (`bug #1491 <https://github.com/matrix-org/synapse/issues/1491>`_). This bug
+  is now fixed, but means that federating with older servers can be unreliable 
+  when using name-based virtual hosting.
 
 Furthermore, a number of the normal reasons for using a reverse-proxy do not
 apply:
diff --git a/changelog.d/4188.misc b/changelog.d/4188.misc
new file mode 100644
index 0000000000..80c3995870
--- /dev/null
+++ b/changelog.d/4188.misc
@@ -0,0 +1 @@
+Update README to reflect the fact that #1491 is fixed