Merge branch 'thirdparty_dev' into dev

Source commit: 83a7777aedf46d1686ff636d0869081e1e524fcf

source/putty/logging.c

@@ -153,6 +153,7 @@ static void logfopen_callback(void *vctx, int mode)
 	logwrite(ctx, data, len);
 	bufchain_consume(&ctx->queue, len);
     }
+    logflush(ctx);
 }
 
 /*

source/putty/ssh.c

@@ -69,7 +69,7 @@ struct ssh_tag {
     int term_width, term_height;
 
     bufchain in_raw, out_raw, user_input;
-    int send_outgoing_eof;
+    int pending_close;
     IdempotentCallback ic_out_raw;
 
     PacketLogSettings pls;
@@ -315,8 +315,10 @@ static void ssh_bpp_output_raw_data_callback(void *vctx)
         }
     }
 
-    if (ssh->send_outgoing_eof)
-        sk_write_eof(ssh->s);
+    if (ssh->pending_close) {
+        sk_close(ssh->s);
+        ssh->s = NULL;
+    }
 }
 
 static void ssh_shutdown_internal(Ssh ssh)
@@ -370,9 +372,10 @@ static void ssh_initiate_connection_close(Ssh ssh)
     ssh_shutdown_internal(ssh);
 
     /* Force any remaining queued SSH packets through the BPP, and
-     * schedule sending of EOF on the network socket after them. */
+     * schedule closing the network socket after they go out. */
     ssh_bpp_handle_output(ssh->bpp);
-    ssh->send_outgoing_eof = TRUE;
+    ssh->pending_close = TRUE;
+    queue_idempotent_callback(&ssh->ic_out_raw);
 
     /* Now we expect the other end to close the connection too in
      * response, so arrange that we'll receive notification of that

source/putty/ssh2connection.c

@@ -2273,9 +2273,9 @@ static void mainchan_send_eof(Channel *chan)
          */
         sshfwd_write_eof(mc->sc);
         ppl_logevent(("Sent EOF message"));
+        s->mainchan_eof_sent = TRUE;
+        s->want_user_input = FALSE;      /* now stop reading from stdin */
     }
-    s->mainchan_eof_sent = TRUE;
-    s->want_user_input = FALSE;      /* now stop reading from stdin */
 }
 
 static void mainchan_set_input_wanted(Channel *chan, int wanted)
@@ -2486,7 +2486,7 @@ static int ssh2_connection_want_user_input(PacketProtocolLayer *ppl)
 {
     struct ssh2_connection_state *s =
         FROMFIELD(ppl, struct ssh2_connection_state, ppl);
-    return s->want_user_input;
+    return s->mainchan_ready && s->want_user_input;
 }
 
 static void ssh2_connection_got_user_input(PacketProtocolLayer *ppl)