From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Sun, 31 Aug 2008 21:45:39 +0000 (+0000)
Subject: Good grief. When I originally wrote the local proxy code two years
X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/commitdiff_plain/6d983afb8617ac09740fb954e3149518d791ee93

Good grief. When I originally wrote the local proxy code two years
ago, I apparently caused all data received from local proxies to be
unconditionally tagged as TCP Urgent. Most network backends ignore
this, but it's critical to the Telnet backend, which will ignore all
Urgent-marked data in the assumption that there's a SYNCH on its way
that it should wait for. Nobody has noticed in two years, presumably
meaning that nobody has ever tried to do Telnet over a local proxy
in that time.


git-svn-id: svn://svn.tartarus.org/sgt/putty@8158 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/unix/uxproxy.c b/unix/uxproxy.c
index f4e67589..ddc55800 100644
--- a/unix/uxproxy.c
+++ b/unix/uxproxy.c
@@ -209,7 +209,7 @@ static int localproxy_select_result(int fd, int event)
 	} else if (ret == 0) {
 	    return plug_closing(s->plug, NULL, 0, 0);
 	} else {
-	    return plug_receive(s->plug, 1, buf, ret);
+	    return plug_receive(s->plug, 0, buf, ret);
 	}
     } else if (event == 2) {
 	assert(fd == s->to_cmd);
diff --git a/windows/winproxy.c b/windows/winproxy.c
index c8221edf..bec00840 100644
--- a/windows/winproxy.c
+++ b/windows/winproxy.c
@@ -39,7 +39,7 @@ int localproxy_gotdata(struct handle *h, void *data, int len)
     } else if (len == 0) {
 	return plug_closing(ps->plug, NULL, 0, 0);
     } else {
-	return plug_receive(ps->plug, 1, data, len);
+	return plug_receive(ps->plug, 0, data, len);
     }
 }