mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-12 09:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge 15a4ed0333 into 13107c6b2b

Browse source
This commit is contained in:
Marcel 2017-10-09 14:25:03 +00:00 committed by GitHub
parent 13107c6b2b 15a4ed0333
commit d0b62aef90
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go
View file

@ -66,7 +66,9 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *authtype
// Whichever returns first is the one we will serve back to the client.
timeoutChan := make(chan struct{})
timer := time.AfterFunc(syncReq.timeout, func() {
if syncReq.timeout != 0 && syncReq.since != types.StreamPosition(0) && !syncReq.wantFullState {
close(timeoutChan) // signal that the timeout has expired
}
})
done := make(chan util.JSONResponse)