file upload is back baby

Hugothms · Jan 6, 2022 · e0a3c1c · e0a3c1c
1 parent b2ea3a3
commit e0a3c1c
Show file tree

Hide file tree

Showing 54 changed files with 11 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE b/LICENSE
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
diff --git a/YoupiBanane/Yeah/not_happy.bad_extension b/YoupiBanane/Yeah/not_happy.bad_extension
diff --git a/YoupiBanane/nop/other.pouic b/YoupiBanane/nop/other.pouic
diff --git a/YoupiBanane/nop/youpi.bad_extension b/YoupiBanane/nop/youpi.bad_extension
diff --git a/YoupiBanane/youpi.bad_extension b/YoupiBanane/youpi.bad_extension
diff --git a/YoupiBanane/youpi.bla b/YoupiBanane/youpi.bla
diff --git a/config/YoupiBanane.conf b/config/YoupiBanane.conf
diff --git a/config/base.conf b/config/base.conf
diff --git a/config/complicado.conf b/config/complicado.conf
diff --git a/config/demo.conf b/config/demo.conf
diff --git a/config/double.conf b/config/double.conf
diff --git a/config/locations.conf b/config/locations.conf
diff --git a/config/nginx.default.conf b/config/nginx.default.conf
diff --git a/default_error_pages/403.html b/default_error_pages/403.html
diff --git a/default_error_pages/404.html b/default_error_pages/404.html
diff --git a/default_error_pages/405.html b/default_error_pages/405.html
diff --git a/en.subject.pdf b/en.subject.pdf
diff --git a/incl/client.hpp b/incl/client.hpp
diff --git a/incl/includes.hpp b/incl/includes.hpp
diff --git a/incl/location.hpp b/incl/location.hpp
diff --git a/incl/log.hpp b/incl/log.hpp
diff --git a/incl/request.hpp b/incl/request.hpp
diff --git a/incl/server.hpp b/incl/server.hpp
diff --git a/incl/webserv.hpp b/incl/webserv.hpp
diff --git a/nginx.output b/nginx.output
diff --git a/notes/Response Status Codes.md b/notes/Response Status Codes.md
diff --git a/notes/config.md b/notes/config.md
diff --git a/notes/requests_examples/chrome_request.txt b/notes/requests_examples/chrome_request.txt
diff --git a/notes/requests_examples/firefox_request.txt b/notes/requests_examples/firefox_request.txt
diff --git a/notes/requests_examples/safari_request.txt b/notes/requests_examples/safari_request.txt
diff --git a/srcs/client.cpp b/srcs/client.cpp
diff --git a/srcs/location.cpp b/srcs/location.cpp
diff --git a/srcs/main.cpp b/srcs/main.cpp
diff --git a/srcs/parse.cpp b/srcs/parse.cpp
diff --git a/srcs/request.cpp b/srcs/request.cpp
@@ -6,7 +6,7 @@
 /*   By: edal--ce <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/11/15 17:21:43 by hthomas           #+#    #+#             */
-/*   Updated: 2022/01/06 10:21:05 by edal--ce         ###   ########.fr       */
+/*   Updated: 2022/01/06 11:22:02 by edal--ce         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -126,11 +126,16 @@ Request::Request(const string &buffer)
 
 	// If there is content length, then we are in post mode, add Body header;
 	if (headers.count("Content-Length") > 0)
-		headers.insert(pair<string, string>("Body", &buffer[pos]));
+	{
+		unsigned int t = ::atoi(headers["Content-Length"].c_str());
+
+		headers.insert(pair<string, string>("Body", string(buffer, pos, t )));
+		DEBUG("INSERTING BODY, POS IS |" <<  headers["Body"]<<"|");
+	}
 
-	// for (map<string, string>::iterator it = headers.begin(); it != headers.end(); it++)
-	// 	DEBUG(it->first << ": " << it->second);
-	// DEBUG("****** REQUEST PARSED *******");
+	for (map<string, string>::iterator it = headers.begin(); it != headers.end(); it++)
+		DEBUG(it->first << ": " << it->second);
+	DEBUG("****** REQUEST PARSED *******");
 	// DEBUG("Done")
 }
 
@@ -438,7 +443,7 @@ void	Request::launch_cgi(string &body, const int pos)
 		if (type == "POST")
 		{
 			close(in_pipe[0]);
-
+			DEBUG("WRITING |"<<headers["Body"] <<'|');
 			if (write(in_pipe[1], headers["Body"].c_str(), headers["Body"].size()) < 0)
 				DEBUG("WRITE ERROR");
 			close(in_pipe[1]);

diff --git a/srcs/server.cpp b/srcs/server.cpp
diff --git a/srcs/utils_header.cpp b/srcs/utils_header.cpp
diff --git a/srcs/utils_parsing.cpp b/srcs/utils_parsing.cpp
diff --git a/srcs/webserv.cpp b/srcs/webserv.cpp
diff --git a/website/cgi-bin/file_upload.py b/website/cgi-bin/file_upload.py
diff --git a/website/cgi-bin/form.php b/website/cgi-bin/form.php
diff --git a/website/cgi-bin/form.py b/website/cgi-bin/form.py
diff --git a/website/demo/form.php b/website/demo/form.php
diff --git a/website/demo/hello.html b/website/demo/hello.html
diff --git a/website/demo/img-up.php b/website/demo/img-up.php
diff --git a/website/demo/index.html b/website/demo/index.html
diff --git a/website/demo/myscript.js b/website/demo/myscript.js
diff --git a/website/demo/style.css b/website/demo/style.css
diff --git a/website/demo/uploadscover3.jpg b/website/demo/uploadscover3.jpg
diff --git a/website/first/page.html b/website/first/page.html
diff --git a/website/first/second/page.html b/website/first/second/page.html