Skip to content
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

Jump to bottom

adding proxy environment variable support #1907

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

adding proxy environment variable support #1907

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
13 changes: 12 additions & 1 deletion yowsup/common/http/warequest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,18 @@ def sendRequest(host, port, path, headers, params, reqType="GET"):
logger.debug(params)

logger.debug("Opening connection to %s" % host);
conn = httplib.HTTPSConnection(host ,port) if port == 443 else httplib.HTTPConnection(host ,port)
if port == 443:
conn_type = 'HTTPS'
else:
conn_type = 'HTTP'

if conn_type+'_PROXY' in os.environ:
proxy_host, proxy_port = os.environ[conn_type+'_PROXY'].split(':')
conFn = getattr(httplib, conn_type+'Connection')
conn = conFn(proxy_host, proxy_port)
conn.set_tunnel(host, port)
else:
conn = httplib.HTTPSConnection(host, port)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about if no proxy env variables are set, but the port is also not 443. In this implementation it seems to still use HTTPSConnection anyways


logger.debug("Sending %s request to %s" % (reqType, path))
conn.request(reqType, path, params, headers);
Expand Down