X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=proxy.c;h=051beb7e9eaabb83a0b38f0704ff99dbd0ec8bdd;hb=b631c1e18e2abb89e8fb8fdf02140f399a1a99c9;hp=0b6d9d5828c8d3fd93a0c9893cea4ec07f07f0f7;hpb=a1f3b7a358adaa7c2a98359cd0373aa823eeb14b;p=PuTTY.git

diff --git a/proxy.c b/proxy.c
index 0b6d9d58..051beb7e 100644
--- a/proxy.c
+++ b/proxy.c
@@ -65,6 +65,9 @@ void proxy_activate (Proxy_Socket p)
      */
     if (p->pending_flush) sk_flush(p->sub_socket);
 
+    /* if we have a pending EOF to send, send it */
+    if (p->pending_eof) sk_write_eof(p->sub_socket);
+
     /* if the backend wanted the socket unfrozen, try to unfreeze.
      * our set_frozen handler will flush buffered receive data before
      * unfreezing the actual underlying socket.
@@ -117,6 +120,17 @@ static int sk_proxy_write_oob (Socket s, const char *data, int len)
     return sk_write_oob(ps->sub_socket, data, len);
 }
 
+static void sk_proxy_write_eof (Socket s)
+{
+    Proxy_Socket ps = (Proxy_Socket) s;
+
+    if (ps->state != PROXY_STATE_ACTIVE) {
+        ps->pending_eof = 1;
+	return;
+    }
+    sk_write_eof(ps->sub_socket);
+}
+
 static void sk_proxy_flush (Socket s)
 {
     Proxy_Socket ps = (Proxy_Socket) s;
@@ -372,6 +386,7 @@ Socket new_connection(SockAddr addr, char *hostname,
 	sk_proxy_close,
 	sk_proxy_write,
 	sk_proxy_write_oob,
+	sk_proxy_write_eof,
 	sk_proxy_flush,
 	sk_proxy_set_private_ptr,
 	sk_proxy_get_private_ptr,
@@ -412,6 +427,7 @@ Socket new_connection(SockAddr addr, char *hostname,
 
 	ret->error = NULL;
 	ret->pending_flush = 0;
+	ret->pending_eof = 0;
 	ret->freeze = 0;
 
 	bufchain_init(&ret->pending_input_data);