Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

e1c5463e

Commit e1c5463e authored 8 years ago by Mark Haines Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #1765 from matrix-org/markjh/timeout_get_missing_events

cherrypick #1744: limit total timeout for get_missing_events to 10s

parents 6028718b 468749c9

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

synapse/federation/federation_client.py 3 additions, 1 deletion

synapse/federation/federation_client.py
synapse/federation/federation_server.py 21 additions, 0 deletions

synapse/federation/federation_server.py
synapse/federation/transport/client.py 3 additions, 2 deletions

synapse/federation/transport/client.py

with 27 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment