diff options
| author | Zdenek Pavlas <zpavlas@redhat.com> | 2013-05-17 10:06:37 +0200 |
|---|---|---|
| committer | Zdenek Pavlas <zpavlas@redhat.com> | 2013-05-20 16:23:48 +0200 |
| commit | 32ec3e4732a1bf9603cf910f848bf2f1c3800309 (patch) | |
| tree | 70e00da40908a8bbca436c6045c4d83e4c82f9dc /urlgrabber | |
| parent | bd308364f44db0a59186b332d16dd91cfd772774 (diff) | |
| download | urlgrabber-32ec3e4732a1bf9603cf910f848bf2f1c3800309.tar.gz | |
Revert "Enable GSSNEGOTIATE when curl >= 7.28.0 BZ 892070."
This reverts commit 9b9a1db530511197d98df076dc97a13252d69711.
Diffstat (limited to 'urlgrabber')
| -rw-r--r-- | urlgrabber/grabber.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py index da15319..37d1297 100644 --- a/urlgrabber/grabber.py +++ b/urlgrabber/grabber.py @@ -1426,11 +1426,9 @@ class PyCurlFileObject(object): # proxy if opts.proxy is not None: self.curl_obj.setopt(pycurl.PROXY, opts.proxy) - auth = pycurl.HTTPAUTH_ANY - if pycurl.version_info()[2] < (7 << 16 | 28 << 8 | 0): - # BZ 769254: work around a bug in curl < 7.28.0 - auth &= ~pycurl.HTTPAUTH_GSSNEGOTIATE - self.curl_obj.setopt(pycurl.PROXYAUTH, auth) + self.curl_obj.setopt(pycurl.PROXYAUTH, + # All but Kerberos. BZ 769254 + pycurl.HTTPAUTH_ANY - pycurl.HTTPAUTH_GSSNEGOTIATE) if opts.username and opts.password: if self.scheme in ('http', 'https'): |