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

「🔨」 fix: now working

Browse Source
This commit is contained in:
Adam JOLY
2025-04-25 14:54:50 +02:00
parent 8d4ef4095a
commit 4ba80434e6
6 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/requests/Cgi.hpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/03/24 14:17:34 by adjoly #+# #+# */
/* Updated: 2025/04/24 14:24:09 by adjoly ### ########.fr */
/* Updated: 2025/04/25 13:40:10 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -28,7 +28,7 @@ class Cgi {
std::string getEnv(std::string &);
void setEnv(std::string &, std::string);
void process(void);
void process(void);
protected:
private:

15
includes/server/Client.hpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/14 14:14:39 by adjoly #+# #+# */
/* Updated: 2025/04/25 13:20:13 by adjoly ### ########.fr */
/* Updated: 2025/04/25 14:33:54 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,7 +15,7 @@
#include <config/default.hpp>
#include <netinet/in.h>
#include <requests/default.hpp>
#include <server/default.hpp>
#include <server/Server.hpp>
#include <webserv.hpp>
namespace webserv {
@ -23,13 +23,20 @@ namespace server {
class Client {
public:
Client();
Client(struct pollfd *, sockaddr_in, config::Config *);
void parse(void);
virtual ~Client(void);
void answer(void);
struct pollfd *getPollfd(void) const { return _pfd; }
bool operator==(int fd) {
if (fd != _pfd->fd)
return false;
return true;
}
private:
void _getRequest(std::string);
@ -38,7 +45,7 @@ class Client {
http::IRequest *_request;
// http::Response *_response;
config::Server *_conf;
config::Config *_Gconf;
config::Config *_Gconf;
};
} // namespace server

6
includes/server/Server.hpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/11 17:45:43 by adjoly #+# #+# */
/* Updated: 2025/04/25 13:23:08 by adjoly ### ########.fr */
/* Updated: 2025/04/25 14:52:50 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -44,7 +44,7 @@ class Server {
/**
* @brief Used to handle client request
*
* @param The fd of the client
* @param the position in the _client_data
*/
bool _handle_client(Client *);
@ -78,6 +78,8 @@ class Server {
return false;
}
Client *_getClient(int);
config::Config
*_conf; // Pointer to the configuration class (with all config in)
Logger *_log; // Pointer to the log class