зеркало из https://github.com/github/putty.git
Missed out a couple of uxsel_tell() which were hanging forwarded X
connections in at least some situations. Oops. [originally from svn r3128]
This commit is contained in:
Родитель
a9c8e035dd
Коммит
22d8cfe36f
12
unix/uxnet.c
12
unix/uxnet.c
|
@ -774,6 +774,12 @@ static int sk_tcp_write(Socket sock, const char *buf, int len)
|
|||
if (s->writable)
|
||||
try_send(s);
|
||||
|
||||
/*
|
||||
* Update the select() status to correctly reflect whether or
|
||||
* not we should be selecting for write.
|
||||
*/
|
||||
uxsel_tell(s);
|
||||
|
||||
return bufchain_size(&s->output_data);
|
||||
}
|
||||
|
||||
|
@ -795,6 +801,12 @@ static int sk_tcp_write_oob(Socket sock, const char *buf, int len)
|
|||
if (s->writable)
|
||||
try_send(s);
|
||||
|
||||
/*
|
||||
* Update the select() status to correctly reflect whether or
|
||||
* not we should be selecting for write.
|
||||
*/
|
||||
uxsel_tell(s);
|
||||
|
||||
return s->sending_oob;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче