MirrorHub/dendrite
0
0
Fork 0
mirror of https://github.com/matrix-org/dendrite synced 2024-12-14 06:13:49 +01:00
Code Issues Releases Wiki Activity

unbreak CORS on /capabilities.

Browse source 
fixes https://github.com/vector-im/element-web/issues/15297
This commit is contained in:
Matthew Hodgson 2020-09-27 22:23:42 +01:00
parent 63af00d5d5
commit 5bbe73747c
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/routing/routing.go
View file

@ -793,7 +793,7 @@ func Setup(
} }
return GetCapabilities(req, rsAPI) return GetCapabilities(req, rsAPI)
}), }),
).Methods(http.MethodGet) ).Methods(http.MethodGet, http.MethodOptions)
// Supplying a device ID is deprecated. // Supplying a device ID is deprecated.
r0mux.Handle("/keys/upload/{deviceID}", r0mux.Handle("/keys/upload/{deviceID}",

2
go.mod
View file

@ -1,5 +1,7 @@
module github.com/matrix-org/dendrite module github.com/matrix-org/dendrite
replace github.com/matrix-org/gomatrixserverlib => ../gomatrixserverlib
require ( require (
github.com/DATA-DOG/go-sqlmock v1.5.0 github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/Shopify/sarama v1.27.0 github.com/Shopify/sarama v1.27.0

2
syncapi/routing/messages.go
View file

@ -179,7 +179,7 @@ func OnIncomingMessagesRequest(
} }
} }
// retrieveEvents retrieve events from the local database for a request on // retrieveEvents retrieves events from the local database for a request on
// /messages. If there's not enough events to retrieve, it asks another // /messages. If there's not enough events to retrieve, it asks another
// homeserver in the room for older events. // homeserver in the room for older events.
// Returns an error if there was an issue talking to the database or with the // Returns an error if there was an issue talking to the database or with the