client/rhel/rhnlib/rhn/connections.py | 8 +++++---
client/rhel/rhnlib/rhnlib.spec | 5 ++++-
rel-eng/packages/rhnlib | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 090b1bacbd0f204657aec4a6f43ed7742cf59787
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Jun 19 16:59:30 2013 -0400
Automatic commit of package [rhnlib] release [2.5.64-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index 36354e4..1360c55 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the Spacewalk project
Name: rhnlib
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.63
+Version: 2.5.64
Release: 1%{?dist}
Group: Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Wed Jun 19 2013 Stephen Herr <sherr(a)redhat.com> 2.5.64-1
+- 947639 - rhnlib timeout fixes
+
* Mon Jun 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.5.63-1
- removed old CVS/SVN version ids
- more branding cleanup
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index 31eedc2..46536da 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.63-1 client/rhel/rhnlib/
+2.5.64-1 client/rhel/rhnlib/
commit c524392bce72ff9db4f59c8467690a0e82ecc429
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Jun 19 16:58:44 2013 -0400
947639 - rhnlib timeout fixes
diff --git a/client/rhel/rhnlib/rhn/connections.py
b/client/rhel/rhnlib/rhn/connections.py
index 034fccb..e89e611 100644
--- a/client/rhel/rhnlib/rhn/connections.py
+++ b/client/rhel/rhnlib/rhn/connections.py
@@ -104,6 +104,10 @@ class HTTPConnection(httplib.HTTPConnection):
return response
+ def connect(self):
+ httplib.HTTPConnection.connect(self)
+ self.sock.settimeout(self.timeout)
+
class HTTPProxyConnection(HTTPConnection):
def __init__(self, proxy, host, port=None, username=None, password=None,
@@ -169,10 +173,9 @@ class HTTPSConnection(HTTPConnection):
sock = None
continue
- sock.settimeout(self.timeout)
-
try:
sock.connect((self.host, self.port))
+ sock.settimeout(self.timeout)
except socket.error, e:
sock.close()
sock = None
@@ -225,7 +228,6 @@ class HTTPSProxyConnection(HTTPProxyConnection):
self.close()
raise xmlrpclib.ProtocolError(host,
response.status, response.reason, response.msg)
- self.sock.settimeout(self.timeout)
self.sock = SSL.SSLSocket(self.sock, self.trusted_certs)
self.sock.init_ssl()