summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvery Pennarun <apenwarr@gmail.com>2011-01-12 09:33:56 -0800
committerAvery Pennarun <apenwarr@gmail.com>2011-01-12 09:33:56 -0800
commitd4c9d3106841f01b5c16915bf44075b0ee6ee7ab (patch)
treee8c4726ac07cccbe52ab7dc2a846571f60af02dd
parent38bb7f3c2159e7d2b154cf30ae2884a3261a7482 (diff)
Oops, we were being overzealous about calling nowrite().sshuttle-0.44a
We were doing it as soon as the other end was shut_read, but we didn't confirm first that the other end's read buffer had been totally emptied. This caused problems on twitter.com, at least, where they create a zillion short-lived connections. I don't actually need these lines at all, as it turns out, because we were already calling nowrite() correctly on the other end after a buffer got emptied.
-rw-r--r--ssnet.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/ssnet.py b/ssnet.py
index b52df4c..62fa378 100644
--- a/ssnet.py
+++ b/ssnet.py
@@ -237,9 +237,7 @@ class Proxy(Handler):
self.wrap2 = wrap2
def pre_select(self, r, w, x):
- if self.wrap1.shut_read: self.wrap2.nowrite()
if self.wrap1.shut_write: self.wrap2.noread()
- if self.wrap2.shut_read: self.wrap1.nowrite()
if self.wrap2.shut_write: self.wrap1.noread()
if self.wrap1.connect_to: