diff options
| author | cjihrig <cjihrig@gmail.com> | 2018-10-08 13:14:58 -0400 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2018-10-09 06:55:34 -0700 |
| commit | c65a523597ccdf2b3544244679dae581040cf52f (patch) | |
| tree | e14e34bb728360c271cd649ba7bd55ce5cef3ede /deps/uv/src/win/tty.c | |
| parent | 13340d47fcdbc9fa0eaaeee52d2c09338590a797 (diff) | |
| download | android-node-v8-c65a523597ccdf2b3544244679dae581040cf52f.tar.gz android-node-v8-c65a523597ccdf2b3544244679dae581040cf52f.tar.bz2 android-node-v8-c65a523597ccdf2b3544244679dae581040cf52f.zip | |
deps: upgrade to libuv 1.23.2
PR-URL: https://github.com/nodejs/node/pull/23336
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Fixes: https://github.com/nodejs/node/issues/23043
Fixes: https://github.com/nodejs/node/issues/21773
Fixes: https://github.com/nodejs/node/issues/16601
Fixes: https://github.com/nodejs/node/issues/22999
Fixes: https://github.com/nodejs/node/issues/23219
Fixes: https://github.com/nodejs/node/issues/23066
Fixes: https://github.com/nodejs/node/issues/23067
Fixes: https://github.com/nodejs/node/issues/23089
Diffstat (limited to 'deps/uv/src/win/tty.c')
| -rw-r--r-- | deps/uv/src/win/tty.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/deps/uv/src/win/tty.c b/deps/uv/src/win/tty.c index 7045b11540..32ccf74ca8 100644 --- a/deps/uv/src/win/tty.c +++ b/deps/uv/src/win/tty.c @@ -1033,6 +1033,7 @@ int uv_tty_read_stop(uv_tty_t* handle) { /* Cancel raw read. Write some bullshit event to force the console wait to * return. */ memset(&record, 0, sizeof record); + record.EventType = FOCUS_EVENT; if (!WriteConsoleInputW(handle->handle, &record, 1, &written)) { return GetLastError(); } @@ -2179,14 +2180,14 @@ void uv_process_tty_write_req(uv_loop_t* loop, uv_tty_t* handle, void uv_tty_close(uv_tty_t* handle) { assert(handle->u.fd == -1 || handle->u.fd > 2); + if (handle->flags & UV_HANDLE_READING) + uv_tty_read_stop(handle); + if (handle->u.fd == -1) CloseHandle(handle->handle); else close(handle->u.fd); - if (handle->flags & UV_HANDLE_READING) - uv_tty_read_stop(handle); - handle->u.fd = -1; handle->handle = INVALID_HANDLE_VALUE; handle->flags &= ~(UV_HANDLE_READABLE | UV_HANDLE_WRITABLE); |