diff --git a/human_curl/core.py b/human_curl/core.py index 243e93f..8e07582 100644 --- a/human_curl/core.py +++ b/human_curl/core.py @@ -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, @@ -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: diff --git a/setup.py b/setup.py index 522bd58..af10c58 100644 --- a/setup.py +++ b/setup.py @@ -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",