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
Container Registry
Model registry
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
Maunium
synapse
Commits
5452a8ee
Commit
5452a8ee
authored
10 years ago
by
Mark Haines
Browse files
Options
Downloads
Patches
Plain Diff
Fix SSL for federation http client
parent
00b042a3
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
synapse/http/client.py
+1
-1
1 addition, 1 deletion
synapse/http/client.py
synapse/http/endpoint.py
+1
-1
1 addition, 1 deletion
synapse/http/endpoint.py
with
2 additions
and
2 deletions
synapse/http/client.py
+
1
−
1
View file @
5452a8ee
...
@@ -180,7 +180,7 @@ class TwistedHttpClient(HttpClient):
...
@@ -180,7 +180,7 @@ class TwistedHttpClient(HttpClient):
# TODO: setup and pass in an ssl_context to enable TLS
# TODO: setup and pass in an ssl_context to enable TLS
endpoint
=
matrix_endpoint
(
endpoint
=
matrix_endpoint
(
reactor
,
destination
,
timeout
=
10
,
reactor
,
destination
,
timeout
=
10
,
ssl_context_factory
=
self
.
hs
.
tls_
tls_
context_factory
ssl_context_factory
=
self
.
hs
.
tls_context_factory
)
)
while
True
:
while
True
:
...
...
This diff is collapsed.
Click to expand it.
synapse/http/endpoint.py
+
1
−
1
View file @
5452a8ee
...
@@ -53,7 +53,7 @@ def matrix_endpoint(reactor, destination, ssl_context_factory=None,
...
@@ -53,7 +53,7 @@ def matrix_endpoint(reactor, destination, ssl_context_factory=None,
default_port
=
8080
default_port
=
8080
else
:
else
:
transport_endpoint
=
SSL4ClientEndpoint
transport_endpoint
=
SSL4ClientEndpoint
endpoint_kw_args
.
update
(
ssl
_c
ontext
_f
actory
=
ssl_context_factory
)
endpoint_kw_args
.
update
(
ssl
C
ontext
F
actory
=
ssl_context_factory
)
default_port
=
443
default_port
=
443
if
port
is
None
:
if
port
is
None
:
...
...
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