summary refs log tree commit diff
path: root/.dockerignore (unfollow)
Commit message (Expand)AuthorFilesLines
2021-04-29typo in changelog v1.33.0rc2Andrew Morgan1-1/+1
2021-04-291.33.0rc2Andrew Morgan3-2/+10
2021-04-28Fix tight loop handling presence replication. (#9900)Erik Johnston3-1/+46
2021-04-28Reword account validity template change to sound less like a bugfix v1.33.0rc1Andrew Morgan1-1/+1
2021-04-281.33.0rc1Andrew Morgan36-35/+54
2021-04-28Revert "Experimental Federation Speedup (#9702)"Andrew Morgan5-138/+93
2021-04-27Remove various bits of compatibility code for Python <3.6 (#9879)Andrew Morgan16-98/+29
2021-04-27Pass errors back to the client when trying multiple federation destinations. ...Patrick Cloke2-58/+61
2021-04-27Use current state table for `presence.get_interested_remotes` (#9887)Erik Johnston2-7/+3
2021-04-23Improved validation for received requests (#9817)Richard van der Hoff15-31/+174
2021-04-23Kill off `_PushHTTPChannel`. (#9878)Richard van der Hoff3-121/+20
2021-04-23Allow OIDC cookies to work on non-root public baseurls (#9726)Andrew Morgan3-9/+22
2021-04-23pass a reactor into SynapseSite (#9874)Richard van der Hoff7-24/+43
2021-04-23Add type hints to auth and auth_blocking. (#9876)Patrick Cloke4-44/+48
2021-04-23Make DomainSpecificString an attrs class (#9875)Erik Johnston4-8/+24
2021-04-23Remove room and user invite ratelimits in default unit test config (#9871)Andrew Morgan2-0/+5
2021-04-23Split presence out of master (#9820)Erik Johnston17-245/+245
2021-04-23Check for space membership during a remote join of a restricted room (#9814)Patrick Cloke6-68/+131
2021-04-23Only store data in caches, not "smart" objects (#9845)Erik Johnston3-141/+182
2021-04-23Limit the size of HTTP responses read over federation. (#9833)Richard van der Hoff4-8/+110
2021-04-22Handle all new rate limits in demo scripts (#9858)manuroe2-12/+43
2021-04-22Limit length of accepted email addresses (#9855)Erik Johnston6-7/+100
2021-04-22Clear the resync bit after resyncing device lists (#9867)Richard van der Hoff3-10/+17
2021-04-22Remove `synapse.types.Collection` (#9856)Richard van der Hoff26-62/+77
2021-04-22A regression can't be introduced twice v1.32.2 release-v1.32.2Andrew Morgan1-2/+2
2021-04-22Note regression was in 1.32.0 and 1.32.1Andrew Morgan1-2/+2
2021-04-21Update dates in changelogsAndrew Morgan2-2/+2
2021-04-211.32.2Andrew Morgan4-2/+18
2021-04-21Note LoggingContext signature change incompatibility in 1.32.0 (#9859) release-v1.32.1Andrew Morgan2-9/+16
2021-04-21Make LoggingContext's name optional (#9857)Richard van der Hoff2-3/+13
2021-04-21Clarify 1.32.0/1 changelog and upgrade notes v1.32.1Andrew Morgan2-8/+7
2021-04-21Add regression notes to CHANGES.md; fix link in 1.32.0 changelogAndrew Morgan1-2/+6
2021-04-21Add link to fixing prometheus to 1.32.0 upgrade notes; 1.32.1 has a fixAndrew Morgan2-2/+6
2021-04-21Fix typo in link to regression in 1.32.0 upgrade notesAndrew Morgan1-1/+1
2021-04-211.32.1Andrew Morgan4-2/+16
2021-04-21Mention Prometheus metrics regression in v1.32.0Andrew Morgan2-0/+15
2021-04-21Stop BackgroundProcessLoggingContext making new prometheus timeseries (#9854)Richard van der Hoff3-5/+18
2021-04-20Rename handler and config modules which end in handler/config. (#9816)Patrick Cloke17-35/+43
2021-04-20Mention Prometheus metrics regression in v1.32.0 release-v1.32.0Andrew Morgan2-0/+15
2021-04-20Further tweaking on gpg signing key noticeAndrew Morgan1-2/+5
2021-04-20Add note about expired Debian gpg signing keys to CHANGES.mdAndrew Morgan1-0/+6
2021-04-20Update v1.32.0 changelog. It's m.login.application_service, not plural v1.32.0Andrew Morgan1-1/+1
2021-04-20 1.32.0Andrew Morgan4-6/+18
2021-04-20Add Application Service registration type requirement + py35, pg95 deprecatio...Andrew Morgan1-0/+18
2021-04-20Always use the name as the log ID. (#9829)Patrick Cloke8-34/+26
2021-04-20Add presence federation stream (#9819)Erik Johnston6-31/+426
2021-04-20Fix bug where we sent remote presence states to remote servers (#9850)Erik Johnston3-3/+13
2021-04-20Fix (final) Bugbear violations (#9838)Jonathan de Jong23-49/+46
2021-04-19Port "Allow users to click account renewal links multiple times without hitti...Andrew Morgan18-263/+496
2021-04-19Sanity check identity server passed to bind/unbind. (#9802)Denis Kasak3-3/+59
2021-04-19Don't send normal presence updates over federation replication stream (#9828)Erik Johnston5-183/+75
2021-04-16User directory: use calculated room membership state instead (#9821)Andrew Morgan3-7/+36
2021-04-16Small speed up joining large remote rooms (#9825)Erik Johnston2-21/+34
2021-04-14remove `HomeServer.get_config` (#9815)Richard van der Hoff9-18/+16
2021-04-14Separate creating an event context from persisting it in the federation handl...Patrick Cloke3-67/+118
2021-04-14Revert "Check for space membership during a remote join of a restricted room....Patrick Cloke7-238/+131
2021-04-14Check for space membership during a remote join of a restricted room. (#9763)Patrick Cloke7-131/+238
2021-04-14Experimental Federation Speedup (#9702)Jonathan de Jong5-97/+129
2021-04-14Move some replication processing out of generic_worker (#9796)Erik Johnston6-483/+486
2021-04-14More robust handling of the Content-Type header for thumbnail generation (#9788)rkfg3-0/+5
2021-04-14Remove redundant "coding: utf-8" lines (#9786)Jonathan de Jong651-651/+1
2021-04-14Add a dockerfile for running a set of Synapse worker processes (#9162)Andrew Morgan11-6/+867
2021-04-14Add note to docker docs explaining platform support (#9801)Andrew Morgan2-3/+7
2021-04-13Update changelog for v1.32.0 v1.32.0rc1Andrew Morgan1-1/+1
2021-04-13 1.32.0rc1Andrew Morgan37-36/+73
2021-04-13Add release helper script (#9713)Erik Johnston3-0/+252
2021-04-13Bump black configuration to target py36 (#9781)Dan Callahan11-15/+16
2021-04-13Add an admin API to manage ratelimit for a specific user (#9648)Dirk Klimpel6-6/+573
2021-04-12Drop Python 3.5 from Trove classifier metadata. (#9782)Dan Callahan2-1/+1
2021-04-12Add option to skip unit tests when building debs (#9793)Dan Callahan4-13/+34
2021-04-12Require AppserviceRegistrationType (#9548)Will Hunt5-23/+60
2021-04-09Use mock from the stdlib. (#9772)Patrick Cloke82-126/+86
2021-04-09Fix duplicate logging of exceptions in transaction processing (#9780)Richard van der Hoff2-7/+4
2021-04-09Enable complement tests for MSC2946. (#9771)Patrick Cloke2-1/+2
2021-04-09Proof of concept for GitHub Actions (#9661)Dan Callahan2-0/+323
2021-04-09Remove old admin API `GET /_synapse/admin/v1/users/<user_id>` (#9401)Dirk Klimpel5-27/+16
2021-04-08Bugbear: Add Mutable Parameter fixes (#9682)Jonathan de Jong38-113/+224
2021-04-08remove unused param on `make_tuple_comparison_clause`Richard van der Hoff5-9/+3
2021-04-08Fix sharded federation sender sometimes using 100% CPU.Erik Johnston2-2/+5
2021-04-08update test_old_deps scriptRichard van der Hoff1-1/+1
2021-04-08Update tox.ini to remove py35Richard van der Hoff1-8/+6
2021-04-08drop support for stretch and xenialRichard van der Hoff1-2/+0
2021-04-08Drop support for sqlite<3.22 as wellRichard van der Hoff6-92/+14
2021-04-08Require py36 and Postgres 9.6Richard van der Hoff3-3/+4
2021-04-08unpin olddeps build from py36Richard van der Hoff2-5/+5
2021-04-08Fix incompatibility with tox 2.5Richard van der Hoff2-6/+13
2021-04-08Put opencontainers labels to the final image (#9765)Johannes Wienke2-5/+6
2021-04-08MSC3083: Check for space membership during a local join of restricted rooms. ...Patrick Cloke3-2/+76
2021-04-08Record more information into structured logs. (#9654)Patrick Cloke10-88/+255
2021-04-06Don't report anything from GaugeBucketCollector metrics until data is present...Andrew Morgan2-3/+14
2021-04-06Add a Synapse Module for configuring presence update routing (#9491)Andrew Morgan14-64/+1282
2021-04-06Add type hints to expiring cache. (#9730)Patrick Cloke8-54/+65
2021-04-06Fix reported bugbear: too broad exception assertion (#9753)Andrew Morgan2-2/+4
2021-04-06Remove outdated constraint on remote_media_cache_thumbnails (#9725)Richard van der Hoff3-3/+41
2021-04-06 1.31.0 v1.31.0 release-v1.31.0Erik Johnston6-7/+27
2021-04-06Add deprecation policy doc (#9723)Erik Johnston4-2/+46
2021-04-06Fix version for bugbear (#9734)Jonathan de Jong2-1/+2
2021-04-06Add type hints to the federation handler and server. (#9743)Patrick Cloke4-95/+97
2021-04-06Convert storage test cases to HomeserverTestCase. (#9736)Patrick Cloke11-499/+265
2021-04-05Update mypy configuration: `no_implicit_optional = True` (#9742)Jonathan de Jong10-11/+21
2021-04-02Fix version for bugbear (#9734)Jonathan de Jong2-1/+2
2021-04-01Improve tracing for to device messages (#9686)Erik Johnston7-19/+102
2021-04-01Add `order_by` to list user admin API (#9691)Dirk Klimpel6-31/+248
2021-03-31Add an experimental room version to support restricted join rules. (#9717)Patrick Cloke6-11/+297
2021-03-31Revert "Use 'dmypy run' in lint.sh instead of 'mypy' (#9701)" (#9720)Patrick Cloke2-1/+2
2021-03-31Make sample config allowed_local_3pids regex stricter. (#9719)Denis Kasak3-4/+5
2021-03-31Deprecate imp (#9718)Cristina2-3/+9
2021-03-31Rewrite complement.sh (#9685)Andrew Morgan2-11/+39
2021-03-30Include m.room.create in invite_room_state for Spaces (#9710)Richard van der Hoff2-0/+5
2021-03-30Replace `room_invite_state_types` with `room_prejoin_state` (#9700)Richard van der Hoff8-43/+144
2021-03-30Make RateLimiter class check for ratelimit overrides (#9711)Erik Johnston16-154/+241
2021-03-30Update changelog v1.31.0rc1Erik Johnston1-3/+7
2021-03-30 1.31.0rc1Erik Johnston45-44/+65
2021-03-30Use 'dmypy run' in lint.sh instead of 'mypy' (#9701)Andrew Morgan2-1/+2
2021-03-29Add type hints to DictionaryCache and TTLCache. (#9442)Patrick Cloke7-67/+96
2021-03-29Clarify that register_new_matrix_user is present also when installed via non-...blakehawkins2-8/+19
2021-03-29Add type hints for the federation sender. (#9681)Patrick Cloke7-59/+177
2021-03-29Update the OIDC sample config (#9695)Richard van der Hoff3-62/+7
2021-03-29Fix CI by ignore type for None module import (#9709)Andrew Morgan2-1/+2
2021-03-29Fix `re.Pattern` mypy error on 3.6 (#9703)Jonathan de Jong2-2/+3
2021-03-29Fix the suggested pip incantation for cryptography (#9699)Richard van der Hoff2-2/+16
2021-03-26Make pip install faster in Docker build for Complement testing (#9610)Eric Eastwood2-43/+42
2021-03-26Suppress CryptographyDeprecationWarning (#9698)Richard van der Hoff4-14/+26
2021-03-26Make it possible to use dmypy (#9692)Erik Johnston16-17/+56
2021-03-26Update cahngelog v1.30.1 release-v1.30.1Erik Johnston1-3/+2
2021-03-26Update cahngelogErik Johnston1-2/+14
2021-03-26 1.30.1Erik Johnston5-3/+26
2021-03-26Explicitly upgrade openssl in docker file and enforce new version of cryptogr...Erik Johnston4-20/+28
2021-03-26Preserve host in example apache config (#9696)Paul Tötterman2-5/+11
2021-03-25Use interpreter from $PATH instead of absolute paths in various scripts using...Quentin Gliech17-17/+18
2021-03-25platform specific prerequisites in source install (#9667)Serban Constantin2-7/+9
2021-03-25Add a storage method for returning all current presence from all users (#9650)Andrew Morgan3-3/+69
2021-03-24Fixed undefined variable error in catchup (#9664)Erik Johnston2-0/+3
2021-03-24Fix typo in changelog.Patrick Cloke2-2/+2
2021-03-24Enable addtional flake8-bugbear linting checks. (#9659)Jonathan de Jong8-8/+9
2021-03-24Spaces summary: call out to other servers (#9653)Richard van der Hoff4-27/+324
2021-03-24docs: fallback/web endpoint does not appear to be mounted on workers (#9679)Ben Banfield-Zanin2-2/+2
2021-03-24Bump mypy-zope to 0.2.13. (#9678)Patrick Cloke2-1/+2
2021-03-24Add type hints to misc. files. (#9676)Patrick Cloke6-54/+57
2021-03-24Add a type hints for service notices to the HomeServer object. (#9675)Patrick Cloke11-40/+52
2021-03-23Increase default join burst ratelimiting (#9674)Erik Johnston3-6/+7
2021-03-23Fix federation stall on concurrent access errors (#9639)Jonathan de Jong2-36/+10
2021-03-23Federation API for Space summary (#9652)Richard van der Hoff3-54/+197
2021-03-23Import HomeServer from the proper module. (#9665)Patrick Cloke59-58/+59
2021-03-22Allow providing credentials to HTTPS_PROXY (#9657)Andrew Morgan4-34/+184
2021-03-22Include opencontainers labels in Docker image (#9612)Johannes Wienke2-0/+6
2021-03-22Fixed code misc. quality issues (#9649)Ankit Dobhal4-3/+4
2021-03-22 1.30.0 v1.30.0 release-v1.30.0Erik Johnston3-3/+16
2021-03-19Incorporate reviewBrendan Abolivier2-2/+2
2021-03-19Fix lintBrendan Abolivier2-11/+10
2021-03-19fix mypyRichard van der Hoff1-4/+7
2021-03-18federation_client: handle inline signing_keys in hs.yaml (#9647)Richard van der Hoff2-54/+18
2021-03-18federation_client: stop adding URL prefix (#9645)Richard van der Hoff2-2/+3
2021-03-18Fix type-hints from bad merge.Patrick Cloke1-2/+2
2021-03-18Initial spaces summary API (#9643)Richard van der Hoff6-3/+277
2021-03-18Move support for MSC3026 behind an experimental flagBrendan Abolivier3-3/+18
2021-03-18Consistently check whether a password may be set for a user. (#9636)Dirk Klimpel5-57/+122
2021-03-18Make federation catchup send last event from any server. (#9640)Erik Johnston4-38/+141
2021-03-18Implement MSC3026: busy presence stateBrendan Abolivier6-1/+27
2021-03-17Ensure we use a copy of the event content dict before modifying it in seriali...Andrew Morgan5-2/+147
2021-03-17Fix up types for the typing handler. (#9638)Patrick Cloke4-14/+30
2021-03-17only save remote cross-signing keys if they're different from the current one...Hubert Chathi2-4/+19
2021-03-17Fix bad naming of storage function (#9637)Erik Johnston4-4/+7
2021-03-17Prep work for removing `outlier` from `internal_metadata` (#9411)Richard van der Hoff7-7/+36
2021-03-17Add type hints to the room member handler. (#9631)Patrick Cloke5-6/+17
2021-03-16Enable flake8-bugbear, but disable most checks. (#9499)Jonathan de Jong12-10/+29
2021-03-16Add SSO attribute requirements for OIDC providers (#9609)Hubbe5-1/+209
2021-03-16Return m.change_password.enabled=false if local database is disabled (#9588)Dirk Klimpel4-15/+58
2021-03-16Fix jemalloc changelog entry wordingAndrew Morgan1-1/+1
2021-03-16Changelog typo v1.30.0rc1Andrew Morgan1-1/+1
2021-03-16Pull up appservice login deprecation noticeAndrew Morgan1-6/+7
2021-03-161.30.0rc1Andrew Morgan46-45/+71
2021-03-16Pass SSO IdP information to spam checker's registration function (#9626)Andrew Morgan5-6/+67
2021-03-16Install jemalloc in docker image (#8553)Mathieu Velten4-2/+17
2021-03-16Handle an empty cookie as an invalid macaroon. (#9620)Patrick Cloke2-1/+3
2021-03-16Add support for stable MSC2858 API (#9617)Richard van der Hoff10-28/+88
2021-03-16Clean up config settings for stats (#9604)Richard van der Hoff4-29/+43
2021-03-16Prevent bundling aggregations for state events (#9619)Andrew Morgan3-2/+9
2021-03-16Fix Internal Server Error on `GET /saml2/authn_response` (#9623)Richard van der Hoff2-2/+9
2021-03-15Revert requiring a specific version of Twisted for mypy checks. (#9618)Patrick Cloke2-2/+1
2021-03-15Fix remaining mypy issues due to Twisted upgrade. (#9608)Patrick Cloke8-34/+42
2021-03-15Don't go into federation catch up mode so easily (#9561)Erik Johnston5-159/+190
2021-03-15Optimise missing prev_event handling (#9601)Richard van der Hoff3-28/+137
2021-03-12Fix additional type hints from Twisted 21.2.0. (#9591)Patrick Cloke18-119/+187
2021-03-12Reject concurrent transactions (#9597)Richard van der Hoff2-35/+43
2021-03-12Improve logging when processing incoming transactions (#9596)Richard van der Hoff3-73/+51
2021-03-11Add logging for redis connection setup (#9590)Richard van der Hoff3-1/+39
2021-03-11Add tests for blacklisting reactor/agent. (#9563)Patrick Cloke3-14/+139
2021-03-11Re-Activating account when local passwords are disabled (#9587)Dirk Klimpel2-1/+5
2021-03-10Convert Requester to attrs (#9586)Richard van der Hoff5-35/+37
2021-03-10Fix the auth provider on the logins metric (#9573)Richard van der Hoff3-18/+33
2021-03-10Fix spam checker modules documentation example (#9580)Jason Robinson2-0/+11
2021-03-10Use the chain cover index in get_auth_chain_ids. (#9576)Patrick Cloke5-11/+226
2021-03-10Fix a bug in the background task for purging chain cover. (#9583)Patrick Cloke2-1/+2
2021-03-09Do not ignore the unpaddedbase64 module when type checking. (#9568)Patrick Cloke2-3/+1
2021-03-09Add a background task to purge unused chain IDs. (#9542)Patrick Cloke4-6/+99
2021-03-09Link to the List user's media admin API from media Admin API docs (#9571)Andrew Morgan2-2/+15
2021-03-09JWT OIDC secrets for Sign in with Apple (#9549)Richard van der Hoff11-47/+444
2021-03-09Retry 5xx errors in federation client (#9567)Erik Johnston2-3/+5
2021-03-09Fix additional type hints. (#9543)Patrick Cloke9-18/+32
2021-03-09Handle image transparency better when thumbnailing. (#9473)Patrick Cloke3-11/+30
2021-03-09Add a list of hashes to ignore during git blame. (#9560)Patrick Cloke3-0/+10
2021-03-09Fixup sample configErik Johnston1-2/+1
2021-03-09Prevent the config-lint script erroring out on any sample_config changes (#9562)Andrew Morgan2-2/+8
2021-03-09Add logging to ObservableDeferred callbacks (#9523)Jonathan de Jong2-8/+19
2021-03-08quick config comment tweak to clarify allow_profile_lookup_over_federationMatthew Hodgson1-2/+1
2021-03-08Add ResponseCache tests. (#9458)Jonathan de Jong10-20/+156
2021-03-08Warn that /register will soon require a type when called with an access token...Will Hunt2-0/+7
2021-03-08Add type hints to purge room and server notice admin API. (#9520)Dirk Klimpel3-15/+24
2021-03-08Add a basic test for purging rooms. (#9541)Patrick Cloke2-26/+46
2021-03-08Fixup changelog v1.29.0 release-v1.29.0Erik Johnston1-0/+3
2021-03-08 1.29.0Erik Johnston3-5/+11
2021-03-08Create a SynapseReactor type which incorporates the necessary reactor interfa...Patrick Cloke8-12/+32
2021-03-06Update reverse proxy to add OpenBSD relayd example configuration. (#9508)Leo Bärring3-4/+53
2021-03-05Add additional SAML2 upgrade notes (#9550)Ben Banfield-Zanin2-0/+8
2021-03-04Replace `last_*_pdu_age` metrics with timestamps (#9540)Richard van der Hoff4-12/+11
2021-03-04Prometheus metrics for logins and registrations (#9511)Richard van der Hoff4-4/+43
2021-03-04Record the SSO Auth Provider in the login token (#9510)Richard van der Hoff13-151/+258
2021-03-04Fix link in UPGRADES v1.29.0rc1Erik Johnston1-3/+3
2021-03-04Fix changelogErik Johnston1-6/+3
2021-03-04 1.29.0rc1Erik Johnston42-41/+55
2021-03-03Fix additional type hints from Twisted upgrade. (#9518)Patrick Cloke12-61/+96
2021-03-03Set X-Forwarded-Proto header when frontend-proxy proxies a request (#9539)Richard van der Hoff2-2/+14
2021-03-03Fix 'rejected_events_metadata' background update (#9537)Erik Johnston2-1/+4
2021-03-03Purge chain cover tables when purging events. (#9498)Patrick Cloke3-10/+38
2021-03-03Add type hints to user admin API. (#9521)Dirk Klimpel4-35/+63
2021-03-03Bump the mypy and mypy-zope versions. (#9529)Patrick Cloke4-3/+4
2021-03-03Make deleting stale pushers a background update (#9536)Erik Johnston3-1/+55
2021-03-03Update nginx reverse-proxy docs (#9512)Richard van der Hoff2-0/+3
2021-03-03Prevent presence background jobs from running when presence is disabled (#9530)Aaron Raimist2-14/+18
2021-03-02Revert "Fix #8518 (sync requests being cached wrongly on timeout) (#9358)"Patrick Cloke3-35/+3
2021-03-02Re-run rejected metadata background update. (#9503)Erik Johnston2-0/+10
2021-03-02Fix SQL delta file taking a long time to run (#9516)Erik Johnston4-5/+60
2021-03-02Add type hints to device and event report admin API (#9519)Dirk Klimpel3-16/+40
2021-03-01Fix a bug when a room alias is given to the admin join endpoint (#9506)Patrick Cloke2-58/+75
2021-03-01(Hopefully) stop leaking file descriptors in media repo. (#9497)Patrick Cloke3-38/+85
2021-03-01Use the proper Request in type hints. (#9515)Patrick Cloke18-31/+38
2021-02-26Allow bytecode again (#9502)Jonathan de Jong8-10/+16
2021-02-26Add support for no_proxy and case insensitive env variables (#9372)Tim Leung6-64/+114
2021-02-26SSO: redirect to public URL before setting cookies (#9436)Richard van der Hoff7-28/+130
2021-02-26Call out the need for an X-Forwarded-Proto in the upgrade notes (#9501)Richard van der Hoff4-1/+28
2021-02-25Test that we require validated email for email pushers (#9496)Erik Johnston3-2/+39
2021-02-25Ensure pushers are deleted for deactivated accounts (#9285)Erik Johnston4-0/+70
2021-02-25Fixup changelog v1.28.0 release-v1.28.0Erik Johnston1-1/+1
2021-02-25Fixup changelogErik Johnston1-4/+5
2021-02-25 1.28.0Erik Johnston4-2/+16
2021-02-24Add support for X-Forwarded-Proto (#9472)Richard van der Hoff3-28/+94
2021-02-24Fix typo in spam checker documentationAndrew Morgan1-1/+1
2021-02-24Add SQL delta for deleting stale pushers (#9479)Erik Johnston2-0/+20
2021-02-24Fix #8518 (sync requests being cached wrongly on timeout) (#9358)Jonathan de Jong3-3/+35