Move mark from WebSockets down to HTTP

uNetworking · Jan 26, 2019 · 4d06180 · 4d06180
1 parent 92fb74b
commit 4d06180
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/App.h b/src/App.h
@@ -55,10 +55,6 @@ struct TemplatedApp {
         httpContext->filter(std::move(filterHandler));
     }
 
-    void registerTag() {
-
-    }
-
     ~TemplatedApp() {
         /* Let's just put everything here */
         if (httpContext) {
@@ -179,8 +175,8 @@ struct TemplatedApp {
                     }
                 }
 
-                /* Add mark, we don't want to end anything */
-                res->writeHeader("WebSocket-Server", "uWebSockets")->end();
+                /* This will add our mark */
+                res->end();
 
                 /* Move any backpressure */
                 std::string backpressure(std::move(((AsyncSocketData<SSL> *) res->getHttpResponseData())->buffer));

diff --git a/src/HttpResponse.h b/src/HttpResponse.h
@@ -81,6 +81,9 @@ struct HttpResponse : public AsyncSocket<SSL> {
         /* Write status if not already done */
         writeStatus(HTTP_200_OK);
 
+        /* Write mark, this propagates to WebSockets too */
+        writeHeader("Web-Server", "uWebSockets v0.15");
+
         /* If no total size given then assume this chunk is everything */
         if (!totalSize) {
             totalSize = data.length();