sigmasternchen/Serwer
1
0
Fork 0
mirror of https://github.com/sigmasternchen/Serwer synced 2025-03-15 23:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

some clean up

Browse source
This commit is contained in:
overflowerror 2017-01-03 01:27:24 +01:00
parent fcfc8d69e9
commit 055e6c3607
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ws_modes/linear.c
View file

@ -66,12 +66,10 @@ int ws_run_linear(webserver_t* server) {
// line end // line end
if (buffersize == 1) { if (buffersize == 1) {
// TODO 400
ws_simple_status(connfd, 400); ws_simple_status(connfd, 400);
break; break;
} }
if (buffer[buffersize - 2] != '\r') { if (buffer[buffersize - 2] != '\r') {
// TODO 400
ws_simple_status(connfd, 400); ws_simple_status(connfd, 400);
break; break;
} }
@ -81,7 +79,6 @@ int ws_run_linear(webserver_t* server) {
ws_log(server, LOG_TESTING, "got last header line"); ws_log(server, LOG_TESTING, "got last header line");
if (headerlines < 1) { if (headerlines < 1) {
// TODO 400
ws_simple_status(connfd, 400); ws_simple_status(connfd, 400);
break; break;
} }
@ -95,9 +92,8 @@ int ws_run_linear(webserver_t* server) {
handler_t* handler = ws_handler_find(server, path, host); handler_t* handler = ws_handler_find(server, path, host);
if (handler == NULL) { if (handler == NULL) {
// TODO 404
ws_log(server, LOG_DEBUG, "handler not found"); ws_log(server, LOG_DEBUG, "handler not found");
ws_simple_status(connfd, 404); ws_simple_status(connfd, 404); // TODO add content
break; break;
} }
ws_log(server, LOG_TESTING, "found"); ws_log(server, LOG_TESTING, "found");
@ -170,8 +166,7 @@ int ws_run_linear(webserver_t* server) {
ws_log(server, LOG_TESTING, "parsing first line"); ws_log(server, LOG_TESTING, "parsing first line");
int e; int e;
if ((e = ws_request_parse(header + headersize, &path, &method)) < 0) { if ((e = ws_request_parse(header + headersize, &path, &method)) < 0) {
ws_log(server, LOG_DEBUG, "parsing error: %i", e); ws_log(server, LOG_DEBUG, "parsing error: %i", e);
// TODO 400
ws_simple_status(connfd, 400); ws_simple_status(connfd, 400);
break; break;
} }

5
ws_utils.c
View file

@ -182,6 +182,9 @@ bool ws_host_match(const char* host, const char* match) {
return false; return false;
} }
} }
// TODO server:80 and server:80* do not match.
// if not whole match string matches, return false // if not whole match string matches, return false
if (m != lenm) if (m != lenm)
return false; return false;
@ -239,6 +242,8 @@ bool ws_path_match(const char* path, const char* match) {
} }
} }
// TODO /hello and /hello* do not match.
// if not whole match string used, return false // if not whole match string used, return false
if (m != lenm) if (m != lenm)
return false; return false;