42_adjoly/webserv
1
0
Fork 0
mirror of https://github.com/KeyZox71/webserv.git synced 2025-05-11 04:38:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

「🏗️」 wip(http): work in progress, not done yet.

Browse Source
This commit is contained in:
Malik Moussouni
2025-04-10 12:18:48 +02:00
parent 4ce004ee06
commit ebb37d8091
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -6,7 +6,7 @@
# By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ # # By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/25 16:09:27 by adjoly #+# #+# # # Created: 2024/10/25 16:09:27 by adjoly #+# #+# #
# Updated: 2025/02/03 16:43:32 by mmoussou ### ########.fr # # Updated: 2025/04/10 11:52:13 by mmoussou ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -57,6 +57,7 @@ fclean: clean
@rm -Rf $(OBJSDIR) @rm -Rf $(OBJSDIR)
@printf "$(RED)「🗑️」 fclean($(NAME)): program deleted\n" @printf "$(RED)「🗑️」 fclean($(NAME)): program deleted\n"
re: fclean all re: fclean
@$(MAKE) -s all
.PHONY: clean fclean all re .PHONY: clean fclean all re

14
src/main.cpp
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */ /* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/03 15:45:07 by mmoussou #+# #+# */ /* Created: 2025/02/03 15:45:07 by mmoussou #+# #+# */
/* Updated: 2025/04/02 05:24:59 by mmoussou ### ########.fr */ /* Updated: 2025/04/10 12:18:39 by mmoussou ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -82,22 +82,29 @@ int main()
} }
// receive the HTTP request // receive the HTTP request
std::string received_data;
char buffer[BUFFER_SIZE]; char buffer[BUFFER_SIZE];
ssize_t bytes_received;
do
{
std::memset(buffer, 0, BUFFER_SIZE); std::memset(buffer, 0, BUFFER_SIZE);
ssize_t bytes_received = recv(client_socket, buffer, BUFFER_SIZE - 1, 0); bytes_received = recv(client_socket, buffer, BUFFER_SIZE - 1, 0);
if (bytes_received == -1) if (bytes_received == -1)
{ {
std::cerr << "Failed to receive request" << std::endl; std::cerr << "Failed to receive request" << std::endl;
close(client_socket); close(client_socket);
continue; continue;
} }
received_data += std::string(buffer, bytes_received);
}
while (buffer[bytes_received]);
// parse the request // parse the request
std::string received_data(buffer, bytes_received);
// handle the request // handle the request
std::string response; std::string response;
//std::cout << received_data << std::endl;
std::cout << getMethod(received_data) << std::endl; std::cout << getMethod(received_data) << std::endl;
if (getMethod(received_data) == "GET") if (getMethod(received_data) == "GET")
@ -113,6 +120,7 @@ int main()
http::Post request(received_data); http::Post request(received_data);
response = request.execute().str(); response = request.execute().str();
//std::cout << "worked" << std::endl;
} }
else else
{ {

6
src/requests_handling/HttpRequests.cpp
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */ /* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/03 16:07:01 by mmoussou #+# #+# */ /* Created: 2025/02/03 16:07:01 by mmoussou #+# #+# */
/* Updated: 2025/04/08 01:11:09 by mmoussou ### ########.fr */ /* Updated: 2025/04/10 11:50:48 by mmoussou ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -393,7 +393,9 @@ http::Response http::Post::execute(void)
handleMultipartData(this->_body, this->getHeaders()["Content-Type"].substr(this->getHeaders()["Content-Type"].find("=", this->getHeaders()["Content-Type"].find(";")) + 1)); handleMultipartData(this->_body, this->getHeaders()["Content-Type"].substr(this->getHeaders()["Content-Type"].find("=", this->getHeaders()["Content-Type"].find(";")) + 1));
response.setProtocol(this->_protocol); response.setProtocol(this->_protocol);
response.setStatusCode(204); response.setStatusCode(200);
response.addHeader("Content-Type", "text/html");
response.setBody(http::Errors::getResponseBody(response.getStatusCode()));
} }
catch (...) catch (...)
{ {