wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 16:51:15 +02:00
Code Activity

GC server: Clear O_NONBLOCK on the right file descriptor

Browse source 
The bug fix in 6d30f9e6fe erroneously
cleared O_NONBLOCK on the server rather than client FD (leaving both
in an incorrect state).

Fixes #8551.
This commit is contained in:
Eelco Dolstra 2023-06-20 11:19:14 +02:00
parent 3910430b9d
commit a6a75ecad8
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/gc.cc
View file

@ -563,7 +563,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
/* On macOS, accepted sockets inherit the /* On macOS, accepted sockets inherit the
non-blocking flag from the server socket, so non-blocking flag from the server socket, so
explicitly make it blocking. */ explicitly make it blocking. */
if (fcntl(fdServer.get(), F_SETFL, fcntl(fdServer.get(), F_GETFL) & ~O_NONBLOCK) == -1) if (fcntl(fdClient.get(), F_SETFL, fcntl(fdClient.get(), F_GETFL) & ~O_NONBLOCK) == -1)
abort(); abort();
while (true) { while (true) {