Even zero is a valid content-length

src/App.h

@@ -176,7 +176,7 @@ public:
                 }
 
                 /* This will add our mark */
-                res->end();
+                res->upgrade();
 
                 /* Move any backpressure */
                 std::string backpressure(std::move(((AsyncSocketData<SSL> *) res->getHttpResponseData())->buffer));

src/HttpResponse.h

@@ -82,7 +82,7 @@ private:
 
     /* Returns true on success, indicating that it might be feasible to write more data.
      * Will start timeout if stream reaches totalSize or write failure. */
-    bool internalEnd(std::string_view data, int totalSize, bool optional) {
+    bool internalEnd(std::string_view data, int totalSize, bool optional, bool allowContentLength = true) {
         /* Write status if not already done */
         writeStatus(HTTP_200_OK);
 
@@ -120,9 +120,9 @@ private:
                 /* Write mark, this propagates to WebSockets too */
                 writeMark();
 
-                /* Ending with no response should not leave any content-length */
+                /* WebSocket upgrades does not allow content-length */
-                if (totalSize) {
+                if (allowContentLength) {
-                    /* We have a known send size */
+                    /* Even zero is a valid content-length */
                     Super::write("Content-Length: ", 16);
                     writeUnsigned(totalSize);
                     Super::write("\r\n\r\n", 4);
@@ -158,6 +158,11 @@ private:
         }
     }
 
+    /* This call is identical to end, but will never write content-length and is thus suitable for upgrades */
+    void upgrade() {
+        internalEnd({nullptr, 0}, 0, false, false);
+    }
+
 public:
     /* Immediately terminate this Http response */
     using Super::close;