summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Toivonen <heikki@heikkitoivonen.net>2010-02-13 06:44:04 +0000
committerHeikki Toivonen <heikki@heikkitoivonen.net>2010-02-13 06:44:04 +0000
commit515a2677e1c49d9bc0ea6e5a971e2c87b8dbce8f (patch)
treeedf954ad06148157558b294a3dcf11442fe8e86d
parent6849184dc45aba52fc1925b00c361dfa81c31f5e (diff)
downloadm2crypto-515a2677e1c49d9bc0ea6e5a971e2c87b8dbce8f.tar.gz
Bug 12910, make httpslib.ProxyHTTPSConnection work with Python 2.3.
git-svn-id: http://svn.osafoundation.org/m2crypto/trunk@722 2715db39-9adf-0310-9c64-84f055769b4b
-rw-r--r--CHANGES1
-rw-r--r--M2Crypto/httpslib.py5
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 644627f..11befa0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@
test_smime.py
- Rename m2.engine_init to engine_init_error so that
ENGINE_init and ENGINE_finish can be exposed, thanks to Erlo
+- Make httpslib.ProxyHTTPSConnection work with Python 2.3
0.20.2 - 2009-10-06
-------------------
diff --git a/M2Crypto/httpslib.py b/M2Crypto/httpslib.py
index 9862862..c1bfd78 100644
--- a/M2Crypto/httpslib.py
+++ b/M2Crypto/httpslib.py
@@ -145,7 +145,10 @@ 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)
+ if sys.version_info < (2,4):
+ HTTPSConnection.putrequest(self, method, rest, skip_host)
+ else:
+ HTTPSConnection.putrequest(self, method, rest, skip_host, skip_accept_encoding)
def putheader(self, header, value):
# Store the auth header if passed in.