refresh (create temporary patch)

diff --git a/meta b/meta
index b5a6428fc1d3f7c7e3c4e00b029a164975a6b35c..9d2375e2241b9d77cdcfda1bf8a14164c880b185 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: e1ec37dfb9636b103221420555a61740b08c6182
-Head: 5cbd0d0dc8394ffda74a1e55badc2e2fb37d27a1
+Previous: 013667c34056942eb41cf4d6ff05812a36a88eb7
+Head: 1e75ba28ee20b822234d91f180b8aba35b83e5ab
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -10,6 +10,7 @@ Applied:
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
   fstat: a957d5786c30dfb1da9cf9345e4a639f6006fbda
   waitall-buggy: 5cbd0d0dc8394ffda74a1e55badc2e2fb37d27a1
+  refresh-temp: 1e75ba28ee20b822234d91f180b8aba35b83e5ab
 Unapplied:
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..bef3563
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,22 @@
+Bottom: 82b0aedfaff9c5dc6df2e8b45d95f760cc338281
+Top:    9ceee3ed5d3b8307cdf04d2f0cca8313992ef22e
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-16 14:25:17 -0700
+
+Refresh of waitall-buggy
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 8c9e847..e48c305 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1141,8 +1141,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+ 
+               ret = 0;
+               if (flags & MSG_PEEK) {
+-                      // fixme or will peek same data in waitall loop
+-                      left -= rs_peek(rs, &buf, left);
++                      left = len - rs_peek(rs, &buf, left);
+                       break;
+               }