From 305501f92c5e24e966a254966c83f05ee2fc2d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 26 Feb 2018 15:54:20 +0100 Subject: [PATCH] Revert "handle SSL connection closing ourself as advised in boo#1068470 bye" This reverts commit 0ddb598743a5be82fe9790f87e892976e1ca9c6d. was incomplete and seems to be the wrong approach --- NEWS | 1 - osc/oscssl.py | 5 ----- 2 files changed, 6 deletions(-) diff --git a/NEWS b/NEWS index 7e633af2..fecd6ad5 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,4 @@ 0.163 - - fix hanging connections for some user (boo#1068470) - add sendsysrq command (requires OBS 2.10) 0.162.1 diff --git a/osc/oscssl.py b/osc/oscssl.py index 78254f20..7aa5a0d8 100644 --- a/osc/oscssl.py +++ b/osc/oscssl.py @@ -216,17 +216,12 @@ class myHTTPSHandler(M2Crypto.m2urllib2.HTTPSHandler): # So make sure the connection gets closed after the (only) # request. headers["Connection"] = "close" - # closing connection ourself to avoid hanging connnections: bsc#1068470 - #headers["Connection"] = "close" try: h.request(req.get_method(), selector, req.data, headers) s = h.get_session() if s: self.saved_session = s r = h.getresponse() - - # close the connection ourselves - h.close() except socket.error as err: # XXX what error? err.filename = full_url raise M2Crypto.m2urllib2.URLError(err)