willem/webserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support different headerseperators

Browse Source
This commit is contained in:
whaffman 2025-10-30 15:06:36 +01:00
parent 334c378d23
commit c2bdbeb307
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webserv-tester

@ -1 +1 @@
Subproject commit 6afa83b23a83cfb98034ab432850cb8a660ff222 Subproject commit 9165a63af961a9892e1d716c984328bf4756cd34

10
webserv/handler/CgiHandler.cpp
View File

@ -161,6 +161,7 @@ void CgiHandler::setPid(int pid)
void CgiHandler::parseCgiOutput() void CgiHandler::parseCgiOutput()
{ {
Log::trace(LOCATION); Log::trace(LOCATION);
long headerSeperatorSize = 2;
// Parse the headers from the buffer // Parse the headers from the buffer
auto header = std::string(buffer_.begin(), buffer_.end()); auto header = std::string(buffer_.begin(), buffer_.end());
@ -169,18 +170,25 @@ void CgiHandler::parseCgiOutput()
header.find("\n\n"), header.find("\n\n"),
header.find("\r\r"), header.find("\r\r"),
}); });
if (headerEnd == std::string::npos) if (headerEnd == std::string::npos)
{ {
Log::debug("CGI output headers not complete yet"); Log::debug("CGI output headers not complete yet");
return; return;
} }
if (header.substr(static_cast<long>(headerEnd), 2) == "\r\n")
{
headerSeperatorSize = 4;
}
Log::debug("headerseperator: " + header.substr(static_cast<long>(headerEnd), 2));
// Parse the headers // Parse the headers
std::string headers(buffer_.begin(), buffer_.begin() + static_cast<long>(headerEnd)); std::string headers(buffer_.begin(), buffer_.begin() + static_cast<long>(headerEnd));
Log::debug("CGI output headers: " + headers); Log::debug("CGI output headers: " + headers);
parseCgiHeaders(headers); parseCgiHeaders(headers);
buffer_.erase(buffer_.begin(), buffer_.begin() + static_cast<long>(headerEnd) + 4); buffer_.erase(buffer_.begin(), buffer_.begin() + static_cast<long>(headerEnd) + headerSeperatorSize);
parseCgiBody(); parseCgiBody();
} }