Merge pull request #97 from lasselukkari/fix-read-return-value

Fix read return value

library.properties

@@ -1,5 +1,5 @@
 name=aWOT
-version=3.2.0
+version=3.2.1
 author=Lasse Lukkari <lasse.lukkari@gmail.com>
 maintainer=Lasse Lukkari <lasse.lukkari@gmail.com>
 sentence=Arduino web server library.

src/aWOT.cpp

@@ -888,6 +888,7 @@ int Request::read(uint8_t* buf, size_t size) {
   while (m_pushbackDepth > 0) {
     *buf++ = m_pushback[--m_pushbackDepth];
     size--;
+    ret++;
   }
 
   int read = m_stream->read(buf, (size < m_left ? size : m_left));

test/buffered-read.cpp

@@ -10,13 +10,46 @@ void handler(Request & req, Response & res) {
   res.write(buffer, read);
 }
 
+void readCountHandler(Request & req, Response & res) {
+  uint8_t buffer[100] = {};
+  req.push(req.read());
+
+  int read = req.read(buffer , 100);
+
+  res.print(read);
+}
+
 unittest(buffered_read) {
   const char *request =
     "POST / HTTP/1.0" CRLF
     "Content-Length: 4" CRLF
     CRLF
     "body";
 
+  const char *expected =
+    "HTTP/1.1 200 OK" CRLF
+    "Content-Type: text/plain" CRLF
+    "Connection: close" CRLF
+    CRLF
+    "4";
+
+  MockStream stream(request);
+  Application app;
+
+  app.post("/", &readCountHandler);
+  app.process(&stream);
+
+  assertEqual(expected, stream.response());
+}
+
+
+unittest(buffered_read_count) {
+  const char *request =
+    "POST / HTTP/1.0" CRLF
+    "Content-Length: 4" CRLF
+    CRLF
+    "body";
+
   const char *expected =
     "HTTP/1.1 200 OK" CRLF
     "Content-Type: text/plain" CRLF