diff options
| author | Heikki Toivonen <heikki@heikkitoivonen.net> | 2009-08-12 18:14:20 +0000 |
|---|---|---|
| committer | Heikki Toivonen <heikki@heikkitoivonen.net> | 2009-08-12 18:14:20 +0000 |
| commit | ad3101d9fe65db95d65cc2b95c40940b48ede768 (patch) | |
| tree | 010e1606d2909197f25548cb0348b79ed22172ab | |
| parent | f09f383fbbb84423e3b10c0e8adb30ab569353e4 (diff) | |
| download | m2crypto-ad3101d9fe65db95d65cc2b95c40940b48ede768.tar.gz | |
Bug 12857, fix regression in httpslib.ProxyHTTPSConnection, by Miloslav Trmac.
git-svn-id: http://svn.osafoundation.org/m2crypto/trunk@709 2715db39-9adf-0310-9c64-84f055769b4b
| -rw-r--r-- | CHANGES | 8 | ||||
| -rw-r--r-- | M2Crypto/httpslib.py | 5 |
2 files changed, 9 insertions, 4 deletions
@@ -1,5 +1,9 @@ -0.20 ----- +0.20.1 +------ +- Fix regression in httpslib.ProxyHTTPSConnection, by Miloslav Trmac + +0.20 - 2009-08-10 +----------------- - Deprecated M2Crypto.PGP subpackage since nobody seems to be using it nor is it being maintained (if you do use it, please let me know) - Added fedora_setup.sh to help work around differences on Fedora Core -based diff --git a/M2Crypto/httpslib.py b/M2Crypto/httpslib.py index 63ba840..9862862 100644 --- a/M2Crypto/httpslib.py +++ b/M2Crypto/httpslib.py @@ -4,7 +4,7 @@ Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved.""" import string, sys import socket -from urlparse import urlsplit +from urlparse import urlsplit, urlunsplit import base64 from httplib import * @@ -122,7 +122,7 @@ class ProxyHTTPSConnection(HTTPSConnection): def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0): #putrequest is called before connect, so can interpret url and get #real host/port to be used to make CONNECT request to proxy - proto, netloc, path, query, fraqment = urlsplit(url) + proto, netloc, path, query, fragment = urlsplit(url) if not proto: raise ValueError, "unknown URL type: %s" % url @@ -144,6 +144,7 @@ class ProxyHTTPSConnection(HTTPSConnection): self._real_host = host self._real_port = int(port) + rest = urlunsplit((None, None, path, query, fragment)) HTTPSConnection.putrequest(self, method, rest, skip_host, skip_accept_encoding) def putheader(self, header, value): |