fix changes feed for couchbase sync gateway

Author: Benjamin Wiegand

couchdb/http.py

@@ -168,6 +168,7 @@ def close(self):
 
     def iterchunks(self):
         assert self.chunked
+        buffer = b''
         while True:
             if self.resp.isclosed():
                 break
@@ -178,8 +179,20 @@ def iterchunks(self):
                 self._release_conn()
                 break
             chunk = self.resp.fp.read(chunksz)
-            for ln in chunk.splitlines():
-                yield ln
+
+            for ln in chunk.splitlines(True):
+                end = (ln == b'\n') and not buffer # end of response
+
+                if ln and not end:
+                    if ln.endswith(b'\n'):
+                        # end of a document
+                        yield buffer + ln
+                        buffer = b''
+                    else:
+                        # a break inside a document --> add to buffer and reuse
+                        # later
+                        buffer += ln
+
             self.resp.fp.read(2) #crlf
 
 

couchdb/tests/couchhttp.py

@@ -64,11 +64,11 @@ def close(self):
             def isclosed(self):
                 return len(self.fp.getvalue()) == self.fp.tell()
 
-        data = b'foobarbaz'
+        data = b'foobarbaz\n'
         data = b'\n'.join([hex(len(data))[2:].encode('utf-8'), data])
         response = http.ResponseBody(TestHttpResp(util.StringIO(data)),
                                      None, None, None)
-        self.assertEqual(list(response.iterchunks()), [b'foobarbaz'])
+        self.assertEqual(list(response.iterchunks()), [b'foobarbaz\n'])
         self.assertEqual(list(response.iterchunks()), [])