Skip to content

Add more proxy types #45

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 2 commits into
base: master
Choose a base branch
from
Open

Add more proxy types #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9cb3f9
Depends on pycurl as it seems now more recent than pycurl2.
llange Aug 10, 2015
3e2f113
Add more socks / http proxy modes.
llange Aug 10, 2015
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
18 changes: 17 additions & 1 deletion human_curl/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,24 @@
CURL_VERSION = ""
logger.warn("Unknown pycURL / cURL version")

try:
PROXYTYPE_HTTP_1_0 = pycurl.PROXYTYPE_HTTP_1_0
except AttributeError, e:
PROXYTYPE_HTTP_1_0 = 1
try:
PROXYTYPE_SOCKS4A = pycurl.PROXYTYPE_SOCKS4A
except AttributeError, e:
PROXYTYPE_SOCKS4A = 6
try:
PROXYTYPE_SOCKS5_HOSTNAME = pycurl.PROXYTYPE_SOCKS5_HOSTNAME
except AttributeError, e:
PROXYTYPE_SOCKS5_HOSTNAME = 7

PROXIES_TYPES_MAP = {
'socks5-hostname': PROXYTYPE_SOCKS5_HOSTNAME,
'socks4a': PROXYTYPE_SOCKS4A,
'https1.0': PROXYTYPE_HTTP_1_0,
'http1.0': PROXYTYPE_HTTP_1_0,
'socks5': pycurl.PROXYTYPE_SOCKS5,
'socks4': pycurl.PROXYTYPE_SOCKS4,
'http': pycurl.PROXYTYPE_HTTP,
Expand Down Expand Up @@ -491,7 +507,7 @@ def build_opener(self, url, opener=None):
opener.setopt(pycurl.PROXYPORT, proxy_addr[1])
opener.setopt(pycurl.PROXYTYPE, get_code_by_name(proxy_type))

if proxy_type.upper() in ("CONNECT", "SSL", "HTTPS"):
if proxy_type.upper() in ("CONNECT", "SSL", "HTTPS", "HTTPS1.0"):
# if CONNECT proxy, need use HTTPPROXYTINNEL
opener.setopt(pycurl.HTTPPROXYTUNNEL, 1)
if proxy_auth:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def run_tests():
url="https://github.com/lispython/human_curl",
packages=["human_curl"],
install_requires=[
'pycurl2'],
'pycurl'],
tests_require=tests_require,
license="BSD",
# test_suite="nose.collector",
Expand Down