Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Ley
synapse
Commits
d93ec0a0
Unverified
Commit
d93ec0a0
authored
3 years ago
by
Andrew Morgan
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Partially revert #11602 to prevent webclient overriding client resource (#11764)
parent
4ec0a309
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/11764.bugfix
+1
-0
1 addition, 0 deletions
changelog.d/11764.bugfix
synapse/app/homeserver.py
+7
-2
7 additions, 2 deletions
synapse/app/homeserver.py
with
8 additions
and
2 deletions
changelog.d/11764.bugfix
0 → 100644
+
1
−
0
View file @
d93ec0a0
Fixes a bug introduced in Synapse 1.50.0rc1 that could cause Matrix clients to be unable to connect to Synapse instances with the 'webclient' resource enabled.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
synapse/app/homeserver.py
+
7
−
2
View file @
d93ec0a0
...
...
@@ -27,7 +27,6 @@ import synapse
import
synapse.config.logger
from
synapse
import
events
from
synapse.api.urls
import
(
CLIENT_API_PREFIX
,
FEDERATION_PREFIX
,
LEGACY_MEDIA_PREFIX
,
MEDIA_R0_PREFIX
,
...
...
@@ -193,7 +192,13 @@ class SynapseHomeServer(HomeServer):
resources
.
update
(
{
CLIENT_API_PREFIX
:
client_resource
,
"
/_matrix/client/api/v1
"
:
client_resource
,
"
/_matrix/client/r0
"
:
client_resource
,
"
/_matrix/client/v1
"
:
client_resource
,
"
/_matrix/client/v3
"
:
client_resource
,
"
/_matrix/client/unstable
"
:
client_resource
,
"
/_matrix/client/v2_alpha
"
:
client_resource
,
"
/_matrix/client/versions
"
:
client_resource
,
"
/.well-known
"
:
well_known_resource
(
self
),
"
/_synapse/admin
"
:
AdminRestResource
(
self
),
**
build_synapse_client_resource_tree
(
self
),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment