mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-21 03:42:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Make HTTP proxy support changes in Twisted 24.7.0rc1

Browse source
This commit is contained in:
Olivier 'reivilibre 2024-07-30 13:08:55 +01:00
parent d216a956b6
commit 48d92ed0f6
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
synapse/http/proxy.py
View file

@ -62,6 +62,15 @@ HOP_BY_HOP_HEADERS = {
"Upgrade", "Upgrade",
} }
if hasattr(Headers, "_canonicalNameCaps"):
# Twisted < 24.7.0rc1
_canonicalHeaderName = Headers()._canonicalNameCaps
else:
# Twisted >= 24.7.0rc1
# But note that `_encodeName` still exists on prior versions,
# it just encodes differently
_canonicalHeaderName = Headers()._encodeName
def parse_connection_header_value( def parse_connection_header_value(
connection_header_value: Optional[bytes], connection_header_value: Optional[bytes],
@ -85,11 +94,10 @@ def parse_connection_header_value(
The set of header names that should not be copied over from the remote response. The set of header names that should not be copied over from the remote response.
The keys are capitalized in canonical capitalization. The keys are capitalized in canonical capitalization.
""" """
headers = Headers()
extra_headers_to_remove: Set[str] = set() extra_headers_to_remove: Set[str] = set()
if connection_header_value: if connection_header_value:
extra_headers_to_remove = { extra_headers_to_remove = {
headers._canonicalNameCaps(connection_option.strip()).decode("ascii") _canonicalHeaderName(connection_option.strip()).decode("ascii")
for connection_option in connection_header_value.split(b",") for connection_option in connection_header_value.split(b",")
} }