Fix #286 - http response headers overwritten with request headers

machinezone · Aug 25, 2023 · 9f3944c · 9f3944c
1 parent a701963
commit 9f3944c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/ixwebsocket/IXHttpServer.cpp b/ixwebsocket/IXHttpServer.cpp
@@ -148,6 +148,7 @@ namespace ix
                     content = gzipCompress(content);
                     headers["Content-Encoding"] = "gzip";
                 }
+                headers["Accept-Encoding"] = "gzip";
 #endif
 
                 // Log request
@@ -161,11 +162,6 @@ namespace ix
                 // headers["Content-Type"] = "application/octet-stream";
                 headers["Accept-Ranges"] = "none";
 
-                for (auto&& it : request->headers)
-                {
-                    headers[it.first] = it.second;
-                }
-
                 return std::make_shared<HttpResponse>(
                     200, "OK", HttpErrorCode::Ok, headers, content);
             });

diff --git a/test/IXHttpServerTest.cpp b/test/IXHttpServerTest.cpp
@@ -60,6 +60,7 @@ TEST_CASE("http server", "[httpd]")
         REQUIRE(response->errorCode == HttpErrorCode::Ok);
         REQUIRE(response->statusCode == 200);
         REQUIRE(response->headers["Accept-Encoding"] == "gzip");
+        REQUIRE(response->headers["Content-Encoding"] == "gzip");
 
         server.stop();
     }