From 43a642f20d123f362afdf6240ed62090d48a4b54 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 13 Aug 2012 14:43:53 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 831c4b3d..54dcfbe3 100644 --- a/meta +++ b/meta @@ -1,11 +1,12 @@ Version: 1 -Previous: 853536fe56092678f43e8004889f171b8b97257a -Head: 9f41de8f49824b574067c97a6cd00b13f3e11e16 +Previous: 71677c45950b7758aad61929c199824b32e7d923 +Head: 264d1be51bf9494b9ca35820f9fc7b925a693418 Applied: real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2 dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824 oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97 fork-connect: 9f41de8f49824b574067c97a6cd00b13f3e11e16 + refresh-temp: 264d1be51bf9494b9ca35820f9fc7b925a693418 Unapplied: dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df fstat: a62c653906870422edef5f6388dac9f76c953e35 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..d02888ba --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,32 @@ +Bottom: e5851de376df609d0644456f8a89570a86a723f0 +Top: 0841906224bb250847983ffd2a5d0bee11b39b28 +Author: Sean Hefty +Date: 2012-08-13 14:43:53 -0700 + +Refresh of fork-connect + +--- + +diff --git a/src/preload.c b/src/preload.c +index 2830f14..33f3baf 100644 +--- a/src/preload.c ++++ b/src/preload.c +@@ -609,7 +609,7 @@ static inline enum fd_type fd_fork_get(int index, int *fd) + if (fdi->type == fd_fork_passive) + fork_passive(index); + else if (fdi->type == fd_fork_active) +- fork_active(index, NULL, 0); ++ fork_active(index); + *fd = fdi->fd; + return fdi->type; + +@@ -636,10 +636,6 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen) + rclose(fd); + fd = ret; + } else if (fd_gets(socket) == fd_fork) { +-// flags = real.fcntl(fd, F_GETFL); +-// if (!(flags & O_NONBLOCK)) +-// return fork_active(socket, addr, addrlen); +-// + fd_store(socket, fd, fd_normal, fd_fork_active); + } -- 2.46.0