Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

a6b18179

Unverified Commit a6b18179 authored 5 years ago by Erik Johnston Committed by GitHub 5 years ago

Downloads
- Plain Diff

Merge pull request #5417 from matrix-org/rav/shared_ssl_context

Share an SSL context object between SSL connections

parents 8da0d83a db74c4fc

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

MANIFEST.in 3 additions, 1 deletion

MANIFEST.in
changelog.d/5417.bugfix 1 addition, 0 deletions

changelog.d/5417.bugfix
synapse/crypto/context_factory.py 106 additions, 74 deletions

synapse/crypto/context_factory.py
synapse/python_dependencies.py 4 additions, 1 deletion

synapse/python_dependencies.py
tests/http/__init__.py 109 additions, 15 deletions

tests/http/__init__.py
tests/http/ca.crt 19 additions, 0 deletions

tests/http/ca.crt
tests/http/ca.key 27 additions, 0 deletions

tests/http/ca.key
tests/http/federation/test_matrix_federation_agent.py 159 additions, 10 deletions

tests/http/federation/test_matrix_federation_agent.py
tests/http/server.key 27 additions, 0 deletions

tests/http/server.key
tests/http/server.pem 0 additions, 81 deletions

tests/http/server.pem

with 455 additions and 182 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