Http: Fix issues introduced when removing dependency from String

Author: Pagghiu

Libraries/Http/HttpServer.cpp

@@ -6,6 +6,7 @@
 #include "../Memory/String.h"
 #include "../Socket/Socket.h"
 #include "Internal/HttpStringAppend.h"
+#include <stdio.h>
 
 // HttpRequest
 bool SC::HttpRequest::find(HttpParser::Token token, StringSpan& res) const
@@ -58,11 +59,20 @@ SC::Result SC::HttpResponse::end(Span<const char> span)
         GrowableBuffer<decltype(outputBuffer)> gb = {outputBuffer};
 
         HttpStringAppend& sb = static_cast<HttpStringAppend&>(static_cast<IGrowableBuffer&>(gb));
-        SC_TRY(sb.append("Content-Length: {}\r\n\r\n", span.sizeInBytes()));
+        SC_TRY(sb.append("Content-Length:"));
+        char bufferSize[32];
+        snprintf(bufferSize, sizeof(bufferSize), "%zu", span.sizeInBytes());
+        StringSpan ss = {{bufferSize, strlen(bufferSize)}, false, StringEncoding::Ascii};
+        SC_TRY(sb.append(ss));
+        SC_TRY(sb.append("\r\n\r\n"));
     }
     SC_TRY(not outputBuffer.isEmpty());
-    SC_TRY(outputBuffer.resizeWithoutInitializing(outputBuffer.size() - 1)); // pop null terminator
     SC_TRY(outputBuffer.append(span));
+    return end();
+}
+
+SC::Result SC::HttpResponse::end()
+{
     responseEnded = true;
     return Result(true);
 }

Libraries/Http/HttpServer.h

@@ -87,6 +87,7 @@ struct SC::HttpResponse
     /// @brief Finalizes response appending some data
     /// @warning The SC::HttpResponse / SC::HttpRequest pair will be invalidated on next SC::AsyncEventLoop run
     Result end(Span<const char> data);
+    Result end();
 
   private:
     friend struct HttpServer;

Libraries/Http/HttpWebServer.cpp

@@ -70,6 +70,13 @@ SC::Result SC::HttpWebServer::Internal::readFile(StringSpan directory, HttpReque
         SC_TRY(Internal::writeGMTHeaderTime("Last-Modified", response, fileStat.modifiedTime.milliseconds));
         SC_TRY(response.end(data.toSpanConst()));
     }
+    else
+    {
+        response.startResponse(404);
+        SC_TRY(response.addHeader("Connection", "Closed"));
+        SC_TRY(response.addHeader("Server", "SC"));
+        response.end();
+    }
     return Result(true);
 }
 
@@ -95,6 +102,30 @@ SC::StringSpan SC::HttpWebServer::Internal::getContentType(const StringSpan exte
     {
         return "image/svg+xml";
     }
+    if (extension == "js")
+    {
+        return "application/javascript";
+    }
+    if (extension == "json")
+    {
+        return "application/json";
+    }
+    if (extension == "xml")
+    {
+        return "application/xml";
+    }
+    if (extension == "pdf")
+    {
+        return "application/pdf";
+    }
+    if (extension == "ico")
+    {
+        return "image/x-icon";
+    }
+    if (extension == "txt")
+    {
+        return "text/plain";
+    }
     return "text/html";
 }
 

Tests/Libraries/Containers/ArrayTest.cpp

@@ -165,7 +165,6 @@ struct SC::ArrayTest : public SC::TestCase
             auto myArr4 = move(myArr1);
             SC_TEST_EXPECT(myArr4.size() == myArr3.size());
             SC_TEST_EXPECT(memcmp(myArr4.data(), myArr3.data(), myArr3.size() * sizeof(int)) == 0);
-
         }
         if (test_section("append"))
         {