summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-03-11 17:44:29 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-03-11 17:44:29 +0000
commitf18dca26daad4b7114716b17b4a9f36a1989f16a (patch)
tree73035f6cf11594d02089b5b990be673d7c7849e5 /changelog.d
parentMerge branch 'develop' into anoa/trailing_slashes_client (diff)
parentMake federation endpoints more tolerant of trailing slashes for some endpoint... (diff)
downloadsynapse-f18dca26daad4b7114716b17b4a9f36a1989f16a.tar.xz
Merge branch 'develop' into anoa/trailing_slashes_client
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/4793.feature1
-rw-r--r--changelog.d/4847.misc1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/4793.feature b/changelog.d/4793.feature
new file mode 100644
index 0000000000..90dba7d122
--- /dev/null
+++ b/changelog.d/4793.feature
@@ -0,0 +1 @@
+Synapse is now permissive about trailing slashes on some of its federation endpoints, allowing zero or more to be present.
\ No newline at end of file
diff --git a/changelog.d/4847.misc b/changelog.d/4847.misc
new file mode 100644
index 0000000000..a001238e08
--- /dev/null
+++ b/changelog.d/4847.misc
@@ -0,0 +1 @@
+Correctly log expected errors when fetching server keys.