diff --git a/base/stream.jl b/base/stream.jl index 462f184483039..6c81f5f44ea6a 100644 --- a/base/stream.jl +++ b/base/stream.jl @@ -409,7 +409,7 @@ function wait_readnb(x::LibuvStream, nb::Int) while bytesavailable(x.buffer) < nb x.readerror === nothing || throw(x.readerror) isopen(x) || break - x.status != StatusEOF || break + x.status == StatusEOF && break x.throttle = max(nb, x.throttle) start_reading(x) # ensure we are reading iolock_end() @@ -665,12 +665,11 @@ function uv_readcb(handle::Ptr{Cvoid}, nread::Cssize_t, buf::Ptr{Cvoid}) elseif nread == UV_EOF # libuv called uv_stop_reading already if stream.status != StatusClosing stream.status = StatusEOF + notify(stream.cond) if stream isa TTY # stream can still be used by reseteof (or possibly write) - notify(stream.cond) elseif !(stream isa PipeEndpoint) && ccall(:uv_is_writable, Cint, (Ptr{Cvoid},), stream.handle) != 0 # stream can still be used by write - notify(stream.cond) else # underlying stream is no longer useful: begin finalization ccall(:jl_close_uv, Cvoid, (Ptr{Cvoid},), stream.handle) @@ -679,6 +678,7 @@ function uv_readcb(handle::Ptr{Cvoid}, nread::Cssize_t, buf::Ptr{Cvoid}) end else stream.readerror = _UVError("read", nread) + notify(stream.cond) # This is a fatal connection error ccall(:jl_close_uv, Cvoid, (Ptr{Cvoid},), stream.handle) stream.status = StatusClosing diff --git a/deps/checksums/libuv b/deps/checksums/libuv index c94d0b551cde4..91a9a8a87ae5d 100644 --- a/deps/checksums/libuv +++ b/deps/checksums/libuv @@ -1,34 +1,34 @@ -LibUV.v2.0.1+6.aarch64-apple-darwin.tar.gz/md5/bff12bc642215646c8c03f2003a3c5ef -LibUV.v2.0.1+6.aarch64-apple-darwin.tar.gz/sha512/9c0bb5e648d1e967caec07c700e4657c97ea9db8b48625887eb4e91af286be62380f5c85bc51bc51c87ed6104ffc26bbd498f501e3892ca1d41eb96bab88d955 -LibUV.v2.0.1+6.aarch64-linux-gnu.tar.gz/md5/af5b11ff1354c591990285e29840d83d -LibUV.v2.0.1+6.aarch64-linux-gnu.tar.gz/sha512/67f6c6a7c780b15b9e4b317c44450a325f6966fd2948d28e113f7d4b0c2893b8b5f9b1eb6da73cce683fa7176b5587e1c73b5b1faaf09d2ad378d8b085a75392 -LibUV.v2.0.1+6.aarch64-linux-musl.tar.gz/md5/2bda667ab6f9b7f8962ec675272be6b2 -LibUV.v2.0.1+6.aarch64-linux-musl.tar.gz/sha512/271772a7acff9d2cce1ab36a46f0807bf2f30a00227d0cfbcbb8eac4c583e0bd406c6406a7e9b5afa720e844b1b2bcc01ec60cae3d907d0d004a7a40ed182397 -LibUV.v2.0.1+6.armv6l-linux-gnueabihf.tar.gz/md5/5765a268e960ebbff2e7f6a386435b06 -LibUV.v2.0.1+6.armv6l-linux-gnueabihf.tar.gz/sha512/31d1a223b57dfd859f6a6633c75b53507b99a3eeccbef9d47f12e0dbf1e4b5a77e489348bda625f0cb6ecf5450edcb751d4fc4603beebb01fde73aceb7ae6d2b -LibUV.v2.0.1+6.armv6l-linux-musleabihf.tar.gz/md5/be91036ac0626c1b5a9b28a15026e942 -LibUV.v2.0.1+6.armv6l-linux-musleabihf.tar.gz/sha512/0e8a338f84ce24ba99357110aa6982956a9970715202005ac4a748d3a78cb75816a9063b3ad5a96569261966792f87fe698777d33b6fa428068ec07ceb944fdf -LibUV.v2.0.1+6.armv7l-linux-gnueabihf.tar.gz/md5/921038ac4396791a555e1c2a8f5af558 -LibUV.v2.0.1+6.armv7l-linux-gnueabihf.tar.gz/sha512/45519d49d857721f025bdb08522e3c08262f264b8a00bc36d9ca4bd05d6a32ce0b1b40ba7c9cfc98bbd1201e6b4592632aa8852652abb61604bcd324abc17c76 -LibUV.v2.0.1+6.armv7l-linux-musleabihf.tar.gz/md5/06b404efd3d62d107f9331ab85deb893 -LibUV.v2.0.1+6.armv7l-linux-musleabihf.tar.gz/sha512/3e73341346060df832fcc591bc447f713a8188c06f22961ae03cba4620d524edae7b84e63ac8fd5b675abb62bf0e12f176468f09e7014fbb8df6cc763dda12b6 -LibUV.v2.0.1+6.i686-linux-gnu.tar.gz/md5/e6b31595a27a91bf34b7a5aeae48d459 -LibUV.v2.0.1+6.i686-linux-gnu.tar.gz/sha512/b59516d2340ed469be8d86dc903e3497867b522082dc6096683b23fec4b03bdc5e0c643bc2cf36ca49c2dfa11689946bd5f7e92bd68978ff2a409935203ba533 -LibUV.v2.0.1+6.i686-linux-musl.tar.gz/md5/49a84d0c90ec136b933fcd939f371716 -LibUV.v2.0.1+6.i686-linux-musl.tar.gz/sha512/1abff45b3a0894b78d20e31c4dcda8673a3e3b6d3e8fa89e8f57da115ae8feff58bcb16cd3107b4c768e9c6bfb777864056fab47de5b2babead3eaa508b2e748 -LibUV.v2.0.1+6.i686-w64-mingw32.tar.gz/md5/6ef4d726e171dc8f2aaa5603180b154b -LibUV.v2.0.1+6.i686-w64-mingw32.tar.gz/sha512/0699afa096208829d7b3795ee150a94e2e0446a17e77c204a7e013f63f51791df0f8c8416c0549809cb0d0c3b1f52fb525310153a68f80652e6c8def9bf17903 -LibUV.v2.0.1+6.powerpc64le-linux-gnu.tar.gz/md5/72cc19fa36b7803a4973c3913c720d46 -LibUV.v2.0.1+6.powerpc64le-linux-gnu.tar.gz/sha512/694d96e8127e4a206496388db4f09d0af0673818f5168fc3ffaa9bd15da132d5af843f068c89f057a0c62404f1e3171725b86e1cdade3e27a3f0e8b6be8e9b2c -LibUV.v2.0.1+6.x86_64-apple-darwin.tar.gz/md5/e3c076ab2aaf47f423f9de96bcd50faa -LibUV.v2.0.1+6.x86_64-apple-darwin.tar.gz/sha512/3a3e31ccb0e2a1c1aec1b2ac52ff33f7116ef84452d70bb0f680a276411a5a9ff4aad5e5533bb7d3d981f168974a94f1ea90d41b4ddc6dab1a334f16000bf812 -LibUV.v2.0.1+6.x86_64-linux-gnu.tar.gz/md5/752545518774845ee93933fce9c9516c -LibUV.v2.0.1+6.x86_64-linux-gnu.tar.gz/sha512/458494e07a096793552ee4f9e0bd302d160186e20d702e7c0691b50984692c5725042faa49df0b1595b3d6f2459bd6d73225af1385e4ff5a9d7e4dd5baaa4dae -LibUV.v2.0.1+6.x86_64-linux-musl.tar.gz/md5/6988efa401aaf11e82a916632b26141e -LibUV.v2.0.1+6.x86_64-linux-musl.tar.gz/sha512/95abfa548c8581be9f512041c1b904532ab8e62610e70b2e184d6638d1bb2552883d946565e3071e6c8f3127a524313d432df370d6d6361a5f0ce5d3c60649ec -LibUV.v2.0.1+6.x86_64-unknown-freebsd.tar.gz/md5/5e35a7220027cd6a8ded93611fed1a57 -LibUV.v2.0.1+6.x86_64-unknown-freebsd.tar.gz/sha512/218b2f40bc1c49d91c9457b9014d536b6fd6b1f6c3704a6aeec2739bcf2ecbadda1bfd36a9ef84ffb2aebd1cb6b1903276658259d4a2d873cd61780a9762934d -LibUV.v2.0.1+6.x86_64-w64-mingw32.tar.gz/md5/1aa9e7ff08da10c79984ac470b31a701 -LibUV.v2.0.1+6.x86_64-w64-mingw32.tar.gz/sha512/675adf9330de80fee97e9ebf7a6de7763a3cafad20b6aa9e009832a590a1a20272578861bb357e3ca41961a247e2be178e4455ad107951d88ce8d3467504c235 -libuv-1b2d16477fe1142adea952168d828a066e03ee4c.tar.gz/md5/054bbd1c7203b67679fbefb8d92d61d8 -libuv-1b2d16477fe1142adea952168d828a066e03ee4c.tar.gz/sha512/0cc8288429e66a9731f153fba949e3c97fba84d1ff3f392d0df4b5f8335c0ac583663269f426cf136914d1dd41131bd53f4ea0167c80970b9fa9ed4f749bf20a +LibUV.v2.0.1+7.aarch64-apple-darwin.tar.gz/md5/efd5c9ada7e02cb58ffe94eac43e35c5 +LibUV.v2.0.1+7.aarch64-apple-darwin.tar.gz/sha512/47c4d6d3bd29d7e14bd0c84648d2a036c74bd0832ec6ad307b4645056fee08bc40cfb39d680716a098117fde949c6d4a3aed17bb7054768c60a685eab773152b +LibUV.v2.0.1+7.aarch64-linux-gnu.tar.gz/md5/e4d8fca2a4a5a32b9d8a8918497891c4 +LibUV.v2.0.1+7.aarch64-linux-gnu.tar.gz/sha512/dcc1fe352f00169182823bb395905ce24f88926ddd24a089d5eb94265a9c4525c014cb50004f2ab5e7d03e898baaeb749d8c609cebb8822272c1ad5fbe98dcca +LibUV.v2.0.1+7.aarch64-linux-musl.tar.gz/md5/c837c53c266ef654af910dbdc21a7e36 +LibUV.v2.0.1+7.aarch64-linux-musl.tar.gz/sha512/e119b8269e85e80bff201ee7e4f96f9e5909e4a54d6e84833c3f417f587da64ce051f4f08ba5b93530bd8c82823eb5d352c845fab1a27c5d19d4471c08b683ae +LibUV.v2.0.1+7.armv6l-linux-gnueabihf.tar.gz/md5/16e44a4bc635c161419608d71a7fba9b +LibUV.v2.0.1+7.armv6l-linux-gnueabihf.tar.gz/sha512/79242d2725a4f5e0fc897593f642574bb9f05d5b3e3627524cea486197b9d964f4ff744bb3796dc880032f8aa05144cf3d6f2635b93849a92867845c26da6f98 +LibUV.v2.0.1+7.armv6l-linux-musleabihf.tar.gz/md5/ed56aa8457d6afb6dde2329af670214e +LibUV.v2.0.1+7.armv6l-linux-musleabihf.tar.gz/sha512/24f6f750ee8e0d4e3262ea6b6a9eb90926d2d08ae37ad042f2b8eae95bfc1a682382057afb8a0470442da1644c0e58a147e30597e299c4255b1e30fcdd354701 +LibUV.v2.0.1+7.armv7l-linux-gnueabihf.tar.gz/md5/4d7892f8c95aae82a60f671911f69100 +LibUV.v2.0.1+7.armv7l-linux-gnueabihf.tar.gz/sha512/41df279e60a5258bd48e8ff6db9984c1f6ad30470a627704a7aa6f329e983a4f782bddde0d2283305056481df9aa93a913b23e823af2fdded2301fefe4c4aa75 +LibUV.v2.0.1+7.armv7l-linux-musleabihf.tar.gz/md5/eb7d0962600be6d1c3ddd097276f14a0 +LibUV.v2.0.1+7.armv7l-linux-musleabihf.tar.gz/sha512/7d8c9220021e9deaa0a497e731921ac086292ce6e27f8eb55f8c0d94dfafe56b6b0fc7f2cd08211fad4860998344db23317d4dff780b2302a122eab9e107e4cd +LibUV.v2.0.1+7.i686-linux-gnu.tar.gz/md5/17ad008414b85df31a4ee947bccde656 +LibUV.v2.0.1+7.i686-linux-gnu.tar.gz/sha512/0e2a4b81d42c32db52705f829513e22414d59df4d56eeb0d576cba1678f23a2f92cdcc503b358250eb9686854ca8dd6341225c313c66b5480ecac9af90853039 +LibUV.v2.0.1+7.i686-linux-musl.tar.gz/md5/4ef789e00793ff1c5a9570a2e2ccb3dd +LibUV.v2.0.1+7.i686-linux-musl.tar.gz/sha512/a01959d4e34a992212707b0f1b3f19a85966757fa5f41c8544ec1d27b565a2f0df9fd4276d16d4948d196da85d30db66c1ec6c6ef6344f1799be9b13bc9e9c1b +LibUV.v2.0.1+7.i686-w64-mingw32.tar.gz/md5/21c1768c1a86e9355e71eee8635ceaac +LibUV.v2.0.1+7.i686-w64-mingw32.tar.gz/sha512/fbe4ae0cc99d574f54837c9e6066cfa6a57261986f627731affc9080cb5432fdfcfafcecd48be7ee385b6189ad61e3188023ed6130a616f4bdf1632eec45a607 +LibUV.v2.0.1+7.powerpc64le-linux-gnu.tar.gz/md5/4fffd17d7d2e790a6af3932a6e9888ac +LibUV.v2.0.1+7.powerpc64le-linux-gnu.tar.gz/sha512/be31976eff5b1b14a9b6d7cc43857409f3e8c41cd8a40638f44b8e58d9d56e017e37f1ff14aa232837d3ceabbaa5451e407a18e30347984e3f820e150a438a90 +LibUV.v2.0.1+7.x86_64-apple-darwin.tar.gz/md5/5859742785a3297acb91547cd3d615e9 +LibUV.v2.0.1+7.x86_64-apple-darwin.tar.gz/sha512/a53d6f101dbb5b3de052687c0cfebecb1975af280c5e3f3e41098d39ac387581acc97abbf6e6696a1f42134a017b14d23fc1487d580bbb831b1e3cda86a4bc9f +LibUV.v2.0.1+7.x86_64-linux-gnu.tar.gz/md5/2fb6bce0804fe609580f79a7307dfb49 +LibUV.v2.0.1+7.x86_64-linux-gnu.tar.gz/sha512/d02071a9d25f098a4afc3888688430effde36bd7ea70093550dfebb32c312501b4ac573b9b2a36a6c69725ed74c139e536c5964d838b0f87cb4e129fe2be834b +LibUV.v2.0.1+7.x86_64-linux-musl.tar.gz/md5/a33faa0b5b1ad126195567fd474f10b8 +LibUV.v2.0.1+7.x86_64-linux-musl.tar.gz/sha512/ce5da3958add0476bb960f0e0bbc5fb3724880aab86094976f94a3579a0149adafeafb82937abb3984f79bc1b67430ddaa40fbc170fbccad1dc37a8bfb7efee3 +LibUV.v2.0.1+7.x86_64-unknown-freebsd.tar.gz/md5/7708318b776b876cafa06298e2e38b14 +LibUV.v2.0.1+7.x86_64-unknown-freebsd.tar.gz/sha512/b2cfa7cee91d37522fd6bf98815c92a900b758b64ed48d8199dd8402730b50b3ef54664be9d2c79f713cbaded2cd3d2a74fd59b8ac4ae6b00eb93d814a7d95a0 +LibUV.v2.0.1+7.x86_64-w64-mingw32.tar.gz/md5/c7379c8cce4d7676541756fa0e786e0e +LibUV.v2.0.1+7.x86_64-w64-mingw32.tar.gz/sha512/ca8ce5c36b96f4fd22916567197d1ef472c5b3cbb4394f0cfcc7956d4012a4d22296eeef3925a156d8986b265a581c8f0d79161d867a66b5894b1d648f451e65 +libuv-2df54fc9459912d940f9fd5e2a16eb1e61bbc784.tar.gz/md5/af8a13a21b63e7c446ac1ed302626a72 +libuv-2df54fc9459912d940f9fd5e2a16eb1e61bbc784.tar.gz/sha512/ebf5533cfed02623e2bb0ecb7634fcee3d7d56d59597cd8be192dc12732b692b9be9a505fc984b4179d3a3346d5824410ace656259111eb1114c2503639ddf17 diff --git a/deps/libuv.version b/deps/libuv.version index b42428669ca87..f214aac0e6ed9 100644 --- a/deps/libuv.version +++ b/deps/libuv.version @@ -3,5 +3,5 @@ LIBUV_JLL_NAME := LibUV ## source build LIBUV_VER := 2 -LIBUV_BRANCH=julia-uv2-1.44.1 -LIBUV_SHA1=1b2d16477fe1142adea952168d828a066e03ee4c +LIBUV_BRANCH=julia-uv2-1.44.2 +LIBUV_SHA1=2df54fc9459912d940f9fd5e2a16eb1e61bbc784 diff --git a/stdlib/LibUV_jll/Project.toml b/stdlib/LibUV_jll/Project.toml index 9441fbf857263..4cbfe35e755e7 100644 --- a/stdlib/LibUV_jll/Project.toml +++ b/stdlib/LibUV_jll/Project.toml @@ -1,6 +1,6 @@ name = "LibUV_jll" uuid = "183b4373-6708-53ba-ad28-60e28bb38547" -version = "2.0.1+6" +version = "2.0.1+7" [deps] Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" diff --git a/stdlib/Sockets/test/runtests.jl b/stdlib/Sockets/test/runtests.jl index a27bb89408f1d..8cf46b6d0827b 100644 --- a/stdlib/Sockets/test/runtests.jl +++ b/stdlib/Sockets/test/runtests.jl @@ -581,7 +581,7 @@ end closewrite(s) @test !iswritable(s) @test isreadable(s) - @test read(s, String) == "hello world\n" + @test_broken read(s, String) == "hello world\n" # half-open state not currently supported for PipeEndpoint or TCP @test !isreadable(s) @test !isopen(s) close(s)