Merge pull request #156 from ilovenoah/153-add-append-cgi-response-he…

…ader add duplicate header in cgi response
ilovenoah · Mar 9, 2024 · 1b9a250 · 1b9a250
2 parents 468cb8a + 8e88c83
commit 1b9a250
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/src/response/Response.cpp b/src/response/Response.cpp
@@ -465,8 +465,14 @@ void Response::_setCGIResponseHeader(const bool shouldKeepAlive) {
  if (utils::compCaseInsensitive(key, "Set-Cookie") == 0) {
  this->_setCookies.push_back(value);
  } else {
- this->_headers.insert(
- std::pair<std::string, std::string>(key, value));
+ std::map<std::string, std::string>::iterator iter =
+ this->_headers.find(key);
+ if (iter != this->_headers.end()) {
+ iter->second.append(", " + value);
+ } else {
+ this->_headers.insert(
+ std::pair<std::string, std::string>(key, value));
+ }
  }
  }
  std::streampos endPos = ss.tellg();

diff --git a/tests/simple_server_function_test/request_file/duplicate_cgi_response_header.txt b/tests/simple_server_function_test/request_file/duplicate_cgi_response_header.txt
@@ -0,0 +1,7 @@
+host, localhost
+port, 8080
+
+
+GET /cgi-bin/duplicate_cgi_response_header.py HTTP/1.1
+Host: test
+Connection: close
diff --git a/tests/simple_server_function_test/response_file/duplicate_cgi_response_header.txt b/tests/simple_server_function_test/response_file/duplicate_cgi_response_header.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 Ok
+Connection: close
+Content-Type: text/html
+Status: 200 OK
+X_test: test1, test2, test3
+
diff --git a/tests/simple_server_function_test/www/cgi-bin/duplicate_cgi_response_header.py b/tests/simple_server_function_test/www/cgi-bin/duplicate_cgi_response_header.py
@@ -0,0 +1,9 @@
+import os
+
+# ステータスとコンテントタイプのヘッダーを出力
+print("Status: 200 OK")
+print("Content-Type: text/html")
+print("X_test: test1")
+print("X_test: test2")
+print("X_test: test3")
+print() # ヘッダーの終わりを示す空行