Commit Graph

37 Commits

Author SHA1 Message Date
LuckyLaszlo
8f167d85f3 wip integration of client.request and ServerConfig
+ Client get return reference
+ wip binary flags for http_method
+ moved config parser files
2022-08-02 21:11:54 +02:00
LuckyLaszlo
5aabeb6b46 removed useless files
+ MethodType renamed to http_method, and moved to utils.hpp
+ operator= overload for Client moved to Client.cpp
2022-08-02 14:26:07 +02:00
hugogogo
f252887d53 merge from hugo, add parsing requests and wip cgi 2022-08-01 20:41:07 +02:00
Me
16af16084b ok, so we added a lot more checks for the config file, and some post processing, still needs a few more things, but now some defaults are set too, basically it works under most circumstances 2022-08-01 00:49:25 +02:00
Me
19f7493aac Fixed the includes 2022-07-31 16:53:22 +02:00
Me
d4a001e8ba resolved merge conflicts, now ConfigParser is even more intertwined with other parts 2022-07-31 16:30:14 +02:00
hugogogo
0d81c76e1a Merge branch 'master' of bitbucket.org:LuckyLaszlo/webserv 2022-07-31 13:19:32 +02:00
hugogogo
537572e2d0 changed itoa to c++ style and put it in utils, and change utils dependencies to not depend on webserv 2022-07-31 13:19:22 +02:00
LuckyLaszlo
ea3f3a390a bugfix invalid ptr in "ev.data.ptr" after vector<Client> resize/erase
+ persistent connections reintroduced
+ bugfix crash if invalid path in request
2022-07-31 13:19:11 +02:00
hugogogo
af8dc072c1 added setsockopt to avoid reusability issue on socket fd 2022-07-31 12:31:55 +02:00
hugogogo
68af40a79f clean makefile includes 2022-07-31 12:05:28 +02:00
hugogogo
5d0432188d clean webserv includes 2022-07-31 11:45:59 +02:00
hugogogo
23844a0d55 clean webserv includes 2022-07-31 11:05:55 +02:00
Me
0cb49ffa5e started adding more checks to the parser, some things settled, but mostly i have a lot more questions... 2022-07-31 04:20:04 +02:00
LuckyLaszlo
e5c2869172 Review parsing Eric and Luke.
Combined the config parser with Webserv class.
2022-07-31 00:27:48 +02:00
Me
2d91b704c3 I think i have successfully merged origin/master into eric_config_parser, seems fine 2022-07-30 21:36:16 +02:00
Me
665623c7ee well i think i have the Config Parser working and pretty clean, there might be a few tweaks here and there but looks good, now to integrate it with Webserv 2022-07-30 21:08:21 +02:00
Me
a5fa5462d4 solid progress today, doesn't compile just yet, so don't know what all my errors are, but i'm happy with the overall logic 2022-07-30 00:30:40 +02:00
Me
001ad6becf Still trying to get it to compile 2022-07-29 23:29:19 +02:00
Me
3ff62f5ddc The Config Parser looks a lot better, cleaner, made a lot of decisions and added i think everything to the apropriate header files, now working on testing but since new install of Ubuntu testing make on something i expect is working, the main branch, so brb 2022-07-29 22:17:10 +02:00
LuckyLaszlo
36868afa30 splitted Webserv.cpp 2022-07-29 17:16:26 +02:00
LuckyLaszlo
e5633a30e4 perror() message fix
+ created dir for next split of Webserv.cpp
2022-07-29 16:05:43 +02:00
LuckyLaszlo
ab8dfed779 basic HTTP GET response 2022-07-29 15:52:43 +02:00
hugogogo
8fb48bcc58 Makefile work with dependencies 2022-07-29 11:06:35 +02:00
hugogogo
04589e123b Makefile work with dependencies 2022-07-29 11:04:21 +02:00
Me
846c478142 ok so it's still a little blocky, could prolly improve more, and i haven't compiled yet, no doubt many issues, but, i did my idea for a better config parser, and it went pretty well 2022-07-29 03:15:08 +02:00
Me
6265019d3e a few good ideas as to how to better handle the config parsing 2022-07-28 18:07:16 +02:00
Me
dfb8be3017 Merge remote-tracking branch 'origin/master' into eric_config_parser
I seem to have fixed the merge errors
2022-07-25 21:05:16 +02:00
Me
35ac55b5e8 still working on integrating the config file stuff 2022-07-25 21:00:04 +02:00
LuckyLaszlo
26dad07a87 SIGINT handling
+ bug with persistent connection, recv() try to read fd 0 (why?)
2022-07-25 07:40:41 +02:00
LuckyLaszlo
dcf94c2c61 Client struct, signal wip, refactoring 2022-07-25 05:28:44 +02:00
Me
b9ccf09089 ok we started moving stuff over but for now it's not all working yet 2022-07-25 03:10:42 +02:00
LuckyLaszlo
72d9709ca7 poll() replaced by epoll() 2022-07-23 07:01:41 +02:00
LuckyLaszlo
cb8cc22c67 example for new usage of poll() 2022-07-20 20:19:13 +02:00
LuckyLaszlo
eb5e719750 change to poll() call 2022-07-12 19:37:47 +02:00
LuckyLaszlo
a9b1843eba basic tcp connection. 2022-07-12 00:51:43 +02:00
LuckyLaszlo
8a7204b7a5 init 2022-07-07 20:13:14 +02:00