(http server) Do not overwrite response headers with request headers

Anna-Boettcher-JPL · Anna-Boettcher-JPL · commit 4578ba3d77bb · 2021-04-19T09:35:21.000-07:00
diff --git a/ixwebsocket/IXHttpServer.cpp b/ixwebsocket/IXHttpServer.cpp
@@ -151,7 +151,11 @@ namespace ix
 
                 for (auto&& it : request->headers)
                 {
-                    headers[it.first] = it.second;
+                    //Do not replace our explicitly set server headers with client headers
+                    if(!headers.count(it.first))
+                    {
+                        headers[it.first] = it.second;
+                    }
                 }
 
                 return std::make_shared<HttpResponse>(

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,11 @@ namespace ix`
`151`	`151`
`152`	`152`	`for (auto&& it : request->headers)`
`153`	`153`	`{`
`154`		`- headers[it.first] = it.second;`
	`154`	`+ //Do not replace our explicitly set server headers with client headers`
	`155`	`+ if(!headers.count(it.first))`
	`156`	`+ {`
	`157`	`+ headers[it.first] = it.second;`
	`158`	`+ }`
`155`	`159`	`}`
`156`	`160`
`157`	`161`	`return std::make_shared<HttpResponse>(`