refresh (create temporary patch)

diff --git a/meta b/meta
index bbf67599368602c10099dd0b99dc0032c0b95b90..5560e10e5981aab1446290551a0118f627b3b285 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: 63ca78b4b45ebde9790f18622247888d1ec73aa5
-Head: 70aeb9a4107206e5814d98d8ea02e15011070735
+Previous: c02b105a2d909a8edd6e0712e96120b77d3b8c78
+Head: 700cb1e575522ed9665e3bdb5150d40f1b01d478
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
   fork-connect: 70aeb9a4107206e5814d98d8ea02e15011070735
+  refresh-temp: 700cb1e575522ed9665e3bdb5150d40f1b01d478
 Unapplied:
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
   fstat: a62c653906870422edef5f6388dac9f76c953e35

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..51cb473
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,30 @@
+Bottom: 8e79723d04b7d3effe0d91fe456426c68892b6bb
+Top:    da811bd45f316fb30abd2a28fca7900d8b0f8de6
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-13 11:09:26 -0700
+
+Refresh of fork-connect
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 9bc6c13..b4c319f 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -498,7 +498,7 @@ static int fork_active(int socket, const struct sockaddr *addr, socklen_t addrle
+       flags = real.fcntl(fd, F_GETFL);
+       real.fcntl(fd, F_SETFL, 0);
+ 
+-      if (!(flags & O_NONBLOCK)) {
++      if (!(flags & O_NONBLOCK) && addr && addrlen) {
+               ret = real.connect(fd, addr, addrlen);
+               if (ret)
+                       return ret;
+@@ -600,7 +600,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); /* NEED addr, addrlen */
++                      fork_active(index, NULL, 0);
+               *fd = fdi->fd;
+               return fdi->type;