Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-30 03:14:22 +00:00
Code Issues Projects Releases Wiki Activity

Make use of a change to netlib.tcp that clarifies error conditions for flush and close.

Browse Source 
Should fix #144.
This commit is contained in:
Aldo Cortesi 2013-07-30 09:42:29 +12:00
parent 5f0b5532bc
commit 439d9a294c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmproxy/proxy.py
View File

@ -85,12 +85,9 @@ class ServerConnection(tcp.TCPClient):
if self.connection: if self.connection:
try: try:
self.wfile.flush() self.wfile.flush()
except IOError, tcp.NetLibDisconnect: # pragma: no cover except tcp.NetLibDisconnect: # pragma: no cover
pass
try:
self.connection.close()
except IOError:
pass pass
self.connection.close()

2
test/test_proxy.py
View File

@ -56,7 +56,7 @@ class TestServerConnection:
sc = proxy.ServerConnection(proxy.ProxyConfig(), "http", self.d.IFACE, self.d.port, "host.com") sc = proxy.ServerConnection(proxy.ProxyConfig(), "http", self.d.IFACE, self.d.port, "host.com")
sc.connect() sc.connect()
sc.connection = mock.Mock() sc.connection = mock.Mock()
sc.connection.close = mock.Mock(side_effect=IOError) sc.connection.flush = mock.Mock(side_effect=tcp.NetLibDisconnect)
sc.terminate() sc.terminate()