refresh

diff --git a/meta b/meta
index 89138ec0cbc4ea767b451a3fec843e8b0f506aa5..a1a613a1c71b2948985eeeb0b22031dd528a5e27 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: b465ced03ef52f2d0c9c77d197fa3c1e5a05d2a2
-Head: f254b104ff4774200fd7d796f53ac6bbb3c2c5ac
+Previous: f678e37a60aaa22eb018b6d1d750391c6f5b3ac8
+Head: 3deb6392dbcb0b29fb4c96f6a7c73c5e3fca3ee1
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
-  fork: c86c2d8e7d556ae2d94b3181939473a50337e550
-  refresh-temp: f254b104ff4774200fd7d796f53ac6bbb3c2c5ac
+  fork: 3deb6392dbcb0b29fb4c96f6a7c73c5e3fca3ee1
 Unapplied:
   rstream-fork: 9f5d60f8ea3e5eee69fc66b0c167b693242a0f4b
   dbg: a0d321cdff2a8176172650619686e0e6e0d41b61

diff --git a/patches/fork b/patches/fork
index 0872b921340bac32911b2164bf8125d71202f679..17f713e0a370d0b59a32c96dc4fd4a3330efa622 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
 Bottom: c0306f4628b14e75db3da212b4a99875f49be65f
-Top:    079d7bbe6129342c62546a42ccf45af677b9160f
+Top:    8e858610108557f53e93dd7af44d25857fb890d0
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-13 15:25:53 -0700
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index d2058e2..6cc0d72 100644
+index d2058e2..e901d13 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -46,6 +46,8 @@
@@ -112,7 +112,7 @@ index d2058e2..6cc0d72 100644
 +      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;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 855d009..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 079d7bbe6129342c62546a42ccf45af677b9160f
-Top:    8e858610108557f53e93dd7af44d25857fb890d0
-Author: Sean Hefty <sean.hefty@intel.com>
-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;