From 804cc93be66b689fb0dc70eb82ba4e0374d3b3b2 Mon Sep 17 00:00:00 2001
From: Jeremy Lakeman <Jeremy.Lakeman@gmail.com>
Date: Fri, 27 Jun 2014 15:07:26 +0930
Subject: [PATCH] Fix HTTP transfers of large payloads

---
 rhizome_restful.c   | 2 +-
 testdefs_rhizome.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rhizome_restful.c b/rhizome_restful.c
index 23e8dad2..baa9863d 100644
--- a/rhizome_restful.c
+++ b/rhizome_restful.c
@@ -735,7 +735,7 @@ int rhizome_payload_content(struct http_request *hr, unsigned char *buf, size_t
   assert(r->u.read_state.offset < r->u.read_state.length);
   uint64_t remain = r->u.read_state.length - r->u.read_state.offset;
   size_t readlen = bufsz;
-  if (remain < bufsz)
+  if (remain <= bufsz)
     readlen = remain;
   else
     readlen &= ~(blocksz - 1);
diff --git a/testdefs_rhizome.sh b/testdefs_rhizome.sh
index 0a8baf6e..09f81820 100644
--- a/testdefs_rhizome.sh
+++ b/testdefs_rhizome.sh
@@ -425,7 +425,7 @@ bundle_received_by() {
             fi
          done
          restart=true
-         pop_instance
+         tfw_nolog pop_instance
          ;;
       --stderr)
          for ((i = 0; i < ${#bundles[*]}; ++i)); do