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

「🔨」 fix: merge conflic on socket.cpp

Browse Source
This commit is contained in:
Adam JOLY
2025-04-20 13:30:10 +02:00
parent 5824985c93
commit bd19d78ac7
4 changed files with 77 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/Config.cpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/14 12:53:54 by adjoly #+# #+# */
/* Updated: 2025/04/18 09:57:01 by adjoly ### ########.fr */
/* Updated: 2025/04/18 10:21:36 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -32,7 +32,7 @@ Config::Config(std::string &filename) {
std::map<std::string, toml::ANode *> *node = table->getTable();
for (std::map<std::string, toml::ANode *>::iterator it = node->begin();
it != node->end(); it++) {
Server *srv = new Server(it->second, _log);
Server *srv = new Server(it->second);
_servers->push_back(srv);
}
delete table;