Skip to content

Add proxy support #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add proxy support #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mautrix/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def __init__(
self.token = token
self.log = log or logging.getLogger("mau.http")
self.session = client_session or ClientSession(
loop=loop, headers={"User-Agent": self.default_ua}
loop=loop, headers={"User-Agent": self.default_ua}, trust_env=True
)
self.as_user_id = as_user_id
self.as_device_id = as_device_id
Expand Down
2 changes: 1 addition & 1 deletion mautrix/client/api/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ async def discover(cls, domain: str, session: ClientSession | None = None) -> UR
WellKnownError: for other errors
"""
if session is None:
async with ClientSession(headers={"User-Agent": HTTPAPI.default_ua}) as sess:
async with ClientSession(headers={"User-Agent": HTTPAPI.default_ua}, trust_env=True) as sess:
return await cls._discover(domain, sess)
else:
return await cls._discover(domain, session)
Expand Down