summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-05-23 08:28:56 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-05-23 08:28:56 -0400
commit4133bceb4153a6674ac5cb9a182942537c1dde45 (patch)
treec0ce2f9a4c3e8594e029276f7712cb6d6e372093
parentd0ef0ed333f1240eab671fe9b145ae0f853b975a (diff)
downloadbcfg2-4133bceb4153a6674ac5cb9a182942537c1dde45.tar.gz
bcfg2-4133bceb4153a6674ac5cb9a182942537c1dde45.tar.bz2
bcfg2-4133bceb4153a6674ac5cb9a182942537c1dde45.zip
Proxy: handle BadStatusLine errors gracefully
-rw-r--r--src/lib/Bcfg2/Proxy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Proxy.py b/src/lib/Bcfg2/Proxy.py
index 9246c0f87..f6db66a93 100644
--- a/src/lib/Bcfg2/Proxy.py
+++ b/src/lib/Bcfg2/Proxy.py
@@ -314,7 +314,7 @@ class XMLRPCTransport(xmlrpclib.Transport):
errcode = response.status
errmsg = response.reason
headers = response.msg
- except (socket.error, SSL_ERROR):
+ except (socket.error, SSL_ERROR, httplib.BadStatusLine):
err = sys.exc_info()[1]
raise ProxyError(xmlrpclib.ProtocolError(host + handler,
408,