Version: 1
-Previous: 82a4b7258b81212efc1b65af5b5a5db7f48547fe
-Head: d39c872f800e92b9e921a6332b9dcf1470b19f75
+Previous: 6430bb5c7e819af94f632c54d19e09e8cdc50067
+Head: e25feca85b5309386f87c67d9cc5a74610205d39
Applied:
real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
fstat: a957d5786c30dfb1da9cf9345e4a639f6006fbda
- waitall-buggy: 00027ae94707991c0bcfeea2b3f56d8c32f53587
- refresh-temp: d39c872f800e92b9e921a6332b9dcf1470b19f75
+ waitall-buggy: e25feca85b5309386f87c67d9cc5a74610205d39
Unapplied:
dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
+++ /dev/null
-Bottom: 9ceee3ed5d3b8307cdf04d2f0cca8313992ef22e
-Top: a382695e2987cbd0d5a442f0e357413683b8c1df
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-08-16 14:26:03 -0700
-
-Refresh of waitall-buggy
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index e48c305..2edd44e 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1141,7 +1141,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
-
- ret = 0;
- if (flags & MSG_PEEK) {
-- left = len - rs_peek(rs, &buf, left);
-+ left = len - rs_peek(rs, buf, left);
- break;
- }
Bottom: 3f4ba48a611f719563dc773a1c33fbd391708df0
-Top: 9ceee3ed5d3b8307cdf04d2f0cca8313992ef22e
+Top: a382695e2987cbd0d5a442f0e357413683b8c1df
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-06-28 11:34:38 -0700
---
diff --git a/src/rsocket.c b/src/rsocket.c
-index 996cb2f..e48c305 100644
+index 996cb2f..2edd44e 100644
--- a/src/rsocket.c
+++ b/src/rsocket.c
@@ -1131,43 +1131,48 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
- rs->rmsg_head = 0;
+ ret = 0;
+ if (flags & MSG_PEEK) {
-+ left = len - rs_peek(rs, &buf, left);
++ left = len - rs_peek(rs, buf, left);
+ break;
}