From aa2c874d06f2e5b95670fb94e3a2e2c90462d81b Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 27 Jun 2012 14:58:01 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 788fc6c6..6a66f74d 100644 --- a/meta +++ b/meta @@ -1,10 +1,11 @@ Version: 1 -Previous: d6490225187a2d508bf408bc079dcc4768ba3da8 -Head: 3c0a743cefee44fc24b5a6fcb8a043f77bf39a53 +Previous: a783c78c4edcc232c6547c2fe4d3a4b8036b4edd +Head: 40e8085b7ea32a642e2fb45b4da2c6dbe1b7aad7 Applied: v6only: 3afce107e2baec86c5541ed0acd992e37bcb992a rselect: 7d25968d337e976e0e22fdba69c8a2a2f5d35008 shut_wr: 3c0a743cefee44fc24b5a6fcb8a043f77bf39a53 + refresh-temp: 40e8085b7ea32a642e2fb45b4da2c6dbe1b7aad7 Unapplied: rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..28d5670b --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,21 @@ +Bottom: 8366a50fa5ca152bee136892dff4bc184f12b4cd +Top: a67f701fbc904bcaea2ce884e38088db7feaff9d +Author: Sean Hefty +Date: 2012-06-27 14:58:01 -0700 + +Refresh of shut_wr + +--- + +diff --git a/src/rsocket.c b/src/rsocket.c +index e3da27f..419e9df 100644 +--- a/src/rsocket.c ++++ b/src/rsocket.c +@@ -1137,7 +1137,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags) + fastlock_acquire(&rs->rlock); + if (!rs_have_rdata(rs)) { + ret = rs_get_comp(rs, rs_nonblocking(rs, flags), rs_conn_have_rdata); +- if (ret) // && errno != ECONNRESET) ++ if (ret) + goto out; + } -- 2.41.0