rpms/m2crypto/devel m2crypto-0.18.2-proxy-ua.patch, NONE, 1.1 m2crypto.spec, 1.40, 1.41

[Miloslav Trmac (mitr)]

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17982

Modified Files:
	m2crypto.spec 
Added Files:
	m2crypto-0.18.2-proxy-ua.patch 
Log Message:
* Sat Jun  7 2008 Miloslav Trmač <mitr at redhat.com> - 0.18.2-5
- Use User-Agent in HTTP proxy CONNECT requests
  Related: #448858


m2crypto-0.18.2-proxy-ua.patch:

--- NEW FILE m2crypto-0.18.2-proxy-ua.patch ---
Allow setting User-agent on HTTPS proxy connections.  Patch by
James Antill <james.antill at redhat.com>.

diff -urN m2crypto/M2Crypto/httpslib.py m2crypto-0.18.2/M2Crypto/httpslib.py
--- m2crypto/M2Crypto/httpslib.py	2008-06-07 00:46:44.000000000 +0200
+++ m2crypto-0.18.2/M2Crypto/httpslib.py	2008-06-07 00:50:05.000000000 +0200
@@ -103,6 +103,7 @@
 
     _ports = {'http' : 80, 'https' : 443}
     _AUTH_HEADER = "Proxy-Authorization"
+    _UA_HEADER   = "User-Agent"
 
     def __init__(self, host, port=None, strict=None, username=None,
         password=None, **ssl):
@@ -116,6 +117,7 @@
         self._username = username
         self._password = password
         self._proxy_auth = None
+        self._proxy_UA   = None
 
     def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0):
         #putrequest is called before connect, so can interpret url and get
@@ -141,6 +143,8 @@
         # Store the auth header if passed in.
         if header.lower() == self._AUTH_HEADER.lower():
             self._proxy_auth = value
+        elif header.lower() == self._UA_HEADER.lower():
+            self._proxy_UA   = value
         else:
             HTTPSConnection.putheader(self, header, value)
 
@@ -173,6 +177,8 @@
         """ Return an HTTP CONNECT request to send to the proxy. """
         msg = "CONNECT %s:%d HTTP/1.1\r\n" % (self._real_host, self._real_port)
         msg = msg + "Host: %s:%d\r\n" % (self._real_host, self._real_port)
+        if self._proxy_UA:
+            msg = msg + "%s: %s\r\n" % (self._UA_HEADER,   self._proxy_UA) 
         if self._proxy_auth:
             msg = msg + "%s: %s\r\n" % (self._AUTH_HEADER, self._proxy_auth) 
         msg = msg + "\r\n"


Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- m2crypto.spec	19 Feb 2008 13:52:58 -0000	1.40
+++ m2crypto.spec	6 Jun 2008 23:04:12 -0000	1.41
@@ -6,10 +6,11 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.18.2
-Release: 4
+Release: 5
 Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
 Patch0: m2crypto-0.18-timeouts.patch
 Patch1: m2crypto-0.18-proxy.patch
+Patch2: m2crypto-0.18.2-proxy-ua.patch
 License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
@@ -25,6 +26,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 # Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
 # doesn't follow the #include.
@@ -77,6 +79,10 @@
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Sat Jun  7 2008 Miloslav Trmač <mitr at redhat.com> - 0.18.2-5
+- Use User-Agent in HTTP proxy CONNECT requests
+  Related: #448858
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.18.2-4
 - Autorebuild for GCC 4.3