Merge branch 'main' of github.com:PythonGermany/42_webserv

Author: Yieen

TODO.md

@@ -4,10 +4,6 @@
 - [ ] fcntl subject
 - [ ] remove inet_ntop
 
-- [ ] Is is possible for client to send data whilst cgi is processing?
-- [ ] (Optional) Fix problem of no server response in case of connection being destructed due to timeout, in every case but especially if cgi is active
-- [ ] (Optional) Implement try_files or similar
-- [ ] (Does not occur anymore without having actively tried to fix it) Investigate random closing of program without any notice after sending a first request
 
 - [x] Implement and fix chunked request trailer parsing
 - [x] Figure out why resolving symlinks doesnt work
@@ -21,5 +17,9 @@
 - [x] Implement chunked transfer encoding (https://datatracker.ietf.org/doc/html/rfc2616#section-3.6 
                                           && https://datatracker.ietf.org/doc/html/rfc2616#section-19.4.6)
 
+- [ ] <del>Is is possible for client to send data whilst cgi is processing?</del>
+- [ ] <del>(Optional) Fix problem of no server response in case of connection being destructed due to timeout, in every case but especially if cgi is active</del>
+- [ ] <del>(Optional) Implement try_files or similar</del>
+- [ ] <del>(Does not occur anymore without having actively tried to fix it) Investigate random closing of program without any notice after sending a first request</del>
 - [ ] <del>Maybe use streambufs instead of streams https://gcc.gnu.org/onlinedocs/libstdc++/manual/fstreams.html#std.io.filestreams.binary</del>
 - [ ] <del>Maybe implement configurable default mime</del>

src/http/Http.cpp

@@ -286,14 +286,7 @@ void Http::processCgi(std::string contentLength) {
       env.push_back("CONTENT_TYPE=" + _request.getHeaderField("Content-type"));
   }
 
-  // TODO: Implement correct server name selection if there are multiple server
-  // names set in the listen directive. Check if according to cgi
-  std::string servername;
-  if (_context->exists("server_name", true))
-    servername = _context->getDirective("server_name", true)[0][0];
-  else
-    servername = _request.getHeaderField("Host");
-  env.push_back("SERVER_NAME=" + servername);
+  env.push_back("SERVER_NAME=" + _request.getHeaderField("Host"));
   env.push_back("SERVER_PORT=" + toString<in_port_t>(host.port()));
   std::ostringstream oss;
   oss << "REMOTE_ADDR=" << client;
@@ -303,9 +296,6 @@ void Http::processCgi(std::string contentLength) {
   env.push_back("HTTP_COOKIE=" + _request.getHeaderField("Cookie"));
   env.push_back("HTTP_USER_AGENT=" + _request.getHeaderField("User-Agent"));
 
-  // env.push_back("PATH_INFO=" ...); // TODO: Implement
-  // env.push_back("PATH_TRANSLATED=" ...);
-
   runCGI(cgiProgramPathname, std::vector<std::string>(1, pathname), env);
   if (_request.isMethod("POST") == false) cgiCloseSendPipe();
   _response.clear();

src/utils/File.cpp

@@ -104,8 +104,9 @@ int File::createDirPath() {
   while (pos != std::string::npos) {
     std::string dir = _path.substr(0, pos);
     if (dir != "" && !File(dir).exists())
-      if (mkdir(dir.c_str(), 0755) != 0)
-        return -1;  // TODO: Possibly find alternative
+      if (mkdir(dir.c_str(), 0755) !=
+          0)  // Needed only for non subject bonus functionality
+        return -1;
     pos = _path.find_first_of('/', pos + 1);
   }
   return 0;