Merge branch 'master' of github.com:mahmoud/hematite

victorfontes · Jun 2, 2014 · 652da17 · 652da17
2 parents 55d3c68 + df22b35
commit 652da17
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/hematite/raw/parser.py b/hematite/raw/parser.py
@@ -438,16 +438,22 @@ def _make_reader(self):
                                 if self.content_length is None
                                 else self.content_length)
 
+        def _stop():
+            self.body.complete(self.bytes_read)
+            self.state = M.Complete
+
         while not self.complete:
             t, read = yield M.NeedData(amount=self.bytes_remaining)
             assert t == M.HaveData.type
 
             amount = len(read)
 
             if not amount:
+                # Connection: close
                 if self.content_length is None or self.bytes_remaining <= 0:
-                    self.state = M.Complete
-                    continue
+                    _stop()
+                    break
+
                 raise IncompleteBody('Could not read remaining {0} '
                                      'bytes'.format(self.bytes_remaining))
 
@@ -459,8 +465,7 @@ def _make_reader(self):
                 self.bytes_remaining = (self.content_length - self.bytes_read)
 
             if self.bytes_remaining <= 0:
-                self.body.complete(self.bytes_read)
-                self.state = M.Complete
+                _stop()
 
         while True:
             yield M.Complete