Merge pull request #16662 from vespa-engine/arnej/handle-content-length-0

handle HTTP response with Content-Length: 0

1 files changed, 5 insertions, 4 deletions

diff --git a/fbench/src/httpclient/httpclient.cpp b/fbench/src/httpclient/httpclient.cpp
index 88ae6a0aa81..ea10ff14269 100644
--- a/fbench/src/httpclient/httpclient.cpp
+++ b/fbench/src/httpclient/httpclient.cpp
@@ -414,15 +414,16 @@ HTTPClient::ContentLengthReader::Read(HTTPClient &client,
         client._bufpos += fromBuffer;
         client._dataRead += fromBuffer;
         res = fromBuffer;
-        if (client._dataRead >= client._contentLength) {
-            client._dataDone = true;
-            return res;
-        }
+    }
+    if (client._dataRead >= client._contentLength) {
+        client._dataDone = true;
+        return res;
     }
     if ((len - fromBuffer) > (len >> 1)) {
         readLen = (len - fromBuffer
                    < client._contentLength - client._dataRead) ?
                   len - fromBuffer : client._contentLength - client._dataRead;
+        assert(readLen > 0);
         readRes = client._socket->read(static_cast<char *>(buf)
                                        + fromBuffer, readLen);
         if (readRes < 0) {