hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-07-29 12:42:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make it possible to point Riot at Dendrite (#74)

Browse source
This commit is contained in:
Kegsay 2017-04-20 17:11:53 +01:00 • committed by GitHub
parent 43d1e94e75
commit 2fadb9e409
4 changed files with 165 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
vendor/manifest vendored
View file

@ -98,7 +98,7 @@
{
"importpath": "github.com/matrix-org/util",
"repository": "https://github.com/matrix-org/util",
"revision": "ec8896cd7d9ba6de6143c5f123d1e45413657e7d",
"revision": "bc9d5e2d2f68a2ca279fce0fa2f28a91ecf301ed",
"branch": "master"
},
{

5
vendor/src/github.com/matrix-org/util/json.go vendored
View file

@ -111,6 +111,11 @@ func MakeJSONAPI(handler JSONRequestHandler) http.HandlerFunc {
logger := GetLogger(req.Context())
logger.Print("Incoming request")
if req.Method == "OPTIONS" {
SetCORSHeaders(w)
w.WriteHeader(200)
return
}
res := handler.OnIncomingRequest(req)
// Set common headers returned regardless of the outcome of the request