From ec58f58f8ddfdb27c33564b4ad70223670638033 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 18 Jul 2012 09:09:30 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index f118ba47..89138ec0 100644 --- a/meta +++ b/meta @@ -1,9 +1,10 @@ Version: 1 -Previous: 1e8bdda7341f77c3600b8c1ef5024b4bb6494ff5 -Head: c86c2d8e7d556ae2d94b3181939473a50337e550 +Previous: b465ced03ef52f2d0c9c77d197fa3c1e5a05d2a2 +Head: f254b104ff4774200fd7d796f53ac6bbb3c2c5ac Applied: transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6 fork: c86c2d8e7d556ae2d94b3181939473a50337e550 + refresh-temp: f254b104ff4774200fd7d796f53ac6bbb3c2c5ac Unapplied: rstream-fork: 9f5d60f8ea3e5eee69fc66b0c167b693242a0f4b dbg: a0d321cdff2a8176172650619686e0e6e0d41b61 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..855d009f --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,22 @@ +Bottom: 079d7bbe6129342c62546a42ccf45af677b9160f +Top: 8e858610108557f53e93dd7af44d25857fb890d0 +Author: Sean Hefty +Date: 2012-07-18 09:09:30 -0700 + +Refresh of fork + +--- + +diff --git a/src/preload.c b/src/preload.c +index 6cc0d72..e901d13 100644 +--- a/src/preload.c ++++ b/src/preload.c +@@ -468,7 +468,7 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl + if (ret) + return ret; + +- ret = real.read(fd, &msg, sizeof msg); ++ ret = real.recv(fd, &msg, sizeof msg, MSG_PEEK); + if ((ret != sizeof msg) || msg) { + fd_store(socket, fd, fd_normal); + return 0; -- 2.41.0