http server: use socket->readBytes which reads in bulk instead of N c…

…alls to socket->readByte
machinezone · Sep 12, 2020 · b04e5c5 · b04e5c5
1 parent 1e8c421
commit b04e5c5
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/ixwebsocket/IXHttp.cpp b/ixwebsocket/IXHttp.cpp
@@ -130,7 +130,7 @@ namespace ix
             return std::make_tuple(false, "Error parsing HTTP headers", httpRequest);
         }
 
-        std::string body = "";
+        std::string body;
         if (headers.find("Content-Length") != headers.end())
         {
             int contentLength = 0;
@@ -144,13 +144,19 @@ namespace ix
                     false, "Error parsing HTTP Header 'Content-Length'", httpRequest);
             }
 
-            char c;
-            body.reserve(contentLength);
+            if (contentLength < 0)
+            {
+                return std::make_tuple(
+                    false, "Error: 'Content-Length' should be a positive integer", httpRequest);
+            }
 
-            for (int i = 0; i < contentLength; i++)
+            auto res = socket->readBytes(contentLength, nullptr, isCancellationRequested);
+            if (!res.first)
             {
-                if (socket->readByte(&c, isCancellationRequested)) body += c;
+                return std::make_tuple(
+                    false, std::string("Error reading request: ") + res.second, httpRequest);
             }
+            body = res.second;
         }
 
         httpRequest = std::make_shared<HttpRequest>(uri, method, httpVersion, body, headers);