Fix HTTP pipelined requests failing after incompletely reading a resp…

…onse body
zargony · Oct 27, 2024 · d7c41e0 · d7c41e0
1 parent c8dff83
commit d7c41e0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/firmware/src/json/reader.rs b/firmware/src/json/reader.rs
@@ -232,6 +232,17 @@ impl<R: BufRead> Reader<R> {
         self.expect(b'l').await?;
         Ok(())
     }
+
+    /// Read and discard any remaining data
+    pub async fn discard_to_end(&mut self) -> Result<(), Error<R::Error>> {
+        loop {
+            match self.reader.fill_buf().await?.len() {
+                0 => break,
+                len => self.reader.consume(len),
+            }
+        }
+        Ok(())
+    }
 }
 
 impl<R: BufRead> Reader<R> {

diff --git a/firmware/src/vereinsflieger/mod.rs b/firmware/src/vereinsflieger/mod.rs
@@ -159,6 +159,11 @@ impl<'a> Connection<'a> {
             response.total_articles
         );
 
+        // Discard remaining body (needed to make the next pipelined request work)
+        json.discard_to_end()
+            .await
+            .map_err(http::Error::MalformedResponse)?;
+
         Ok(())
     }
 }