Me
6f0c3b4d6d
kinda successful merge, weird tho, didn't go as smoothly with VScode as usual...
2022-08-05 22:25:11 +02:00
Me
f7dc5ccde4
ok Location sorting and processing is finally working as expected, still a few things to add like error_pages but will get there soon
2022-08-05 21:46:46 +02:00
LuckyLaszlo
914d4cb0c0
HTML_ERROR Macro reformat
2022-08-05 04:44:23 +02:00
LuckyLaszlo
e596d8f093
MIME types map for correct Content-type header
...
+ append body to string cause encoding problem, so added temp buf in Client.
2022-08-05 04:24:15 +02:00
Me
9ac14aa1aa
Well we learned a lot from Nginx, starting to incorporate some, but hoping for feedback before i do most of that, instead worked on improving the location sorter and checking that locations paths are valid, close but not quite done
2022-08-05 03:42:42 +02:00
LuckyLaszlo
3102253092
wip DELETE, POST (no cgi, need testing)
2022-08-04 20:56:37 +02:00
Eric LAZO
f7e6b61811
LocationConfig sorter works as intended, tho should prolly check things thoroughly later
2022-08-04 19:33:38 +02:00
Me
fce1bcbece
well, the location sorter is better, but i don't understand why, kinda by accident, will try to figure it out
2022-08-04 16:45:12 +02:00
LuckyLaszlo
a9ada4cb28
CRLF macro
2022-08-04 14:45:16 +02:00
LuckyLaszlo
0026106bf6
default and custom error pages response
...
+ refactoring in response.cpp (functions split)
+ added Client::clear()
+ added replace_all_substr() in utils.cpp
2022-08-04 02:52:31 +02:00
Me
ca8427262d
wrote a tiny thing to improve the operator< overlaod, will test tomorrow
2022-08-04 01:41:19 +02:00
Me
3d46505411
well, restructured things a bit, but mostly started trying to sort LocationConfigs, it is sort of going well, good ideas, implementations is still a bit lacking...
2022-08-04 01:09:40 +02:00
LuckyLaszlo
6f5b28dd93
wip, need somes changes in ConfigParser.
...
+ _determine_location()
+ http_method changes
+ http_method switch in _construct_response()
+ ConfigParser::_str_to_method_type() moved to global utils.cpp
2022-08-03 18:39:22 +02:00
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
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
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
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
