lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Added favicon

Browse Source
This commit is contained in:
Lorenz Stechauner
2020-12-15 21:55:02 +01:00
parent 7c2e3f2f9b
commit a6789a7f3e
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/client.c
View File

@ -44,6 +44,7 @@ int client_request_handler(sock *client, int req_num) {
char err_msg[256]; char err_msg[256];
err_msg[0] = 0; err_msg[0] = 0;
char *host, *hdr_connection, *webroot; char *host, *hdr_connection, *webroot;
unsigned long content_length = 0;
fd_set socket_fds; fd_set socket_fds;
FD_ZERO(&socket_fds); FD_ZERO(&socket_fds);
@ -105,18 +106,20 @@ int client_request_handler(sock *client, int req_num) {
} else { } else {
http_add_header_field(&res.hdr, "Connection", "close"); http_add_header_field(&res.hdr, "Connection", "close");
} }
int len = 0; unsigned long len = 0;
if (res.status->code >= 300 && res.status->code < 600) { if (res.status->code >= 300 && res.status->code < 600) {
http_error_msg *http_msg = http_get_error_msg(res.status->code); http_error_msg *http_msg = http_get_error_msg(res.status->code);
sprintf(msg_pre_buf, http_error_document, res.status->code, res.status->msg, sprintf(msg_pre_buf, http_error_document, res.status->code, res.status->msg,
http_msg != NULL ? http_msg->err_msg : "", err_msg[0] != 0 ? err_msg : ""); http_msg != NULL ? http_msg->err_msg : "", err_msg[0] != 0 ? err_msg : "");
len = sprintf(msg_buf, http_default_document, res.status->code, res.status->msg, len = sprintf(msg_buf, http_default_document, res.status->code, res.status->msg,
msg_pre_buf, res.status->code >= 300 && res.status->code < 400 ? "info" : "error"); msg_pre_buf, res.status->code >= 300 && res.status->code < 400 ? "info" : "error",
sprintf(buf, "%i", len); http_error_icon);
sprintf(buf, "%li", len);
http_add_header_field(&res.hdr, "Content-Length", buf); http_add_header_field(&res.hdr, "Content-Length", buf);
http_add_header_field(&res.hdr, "Content-Type", "text/html; charset=UTF-8"); http_add_header_field(&res.hdr, "Content-Type", "text/html; charset=UTF-8");
} else { } else {
http_add_header_field(&res.hdr, "Content-Length", "0"); sprintf(buf, "%li", content_length);
http_add_header_field(&res.hdr, "Content-Length", buf);
} }
http_send_response(client, &res); http_send_response(client, &res);
@ -124,7 +127,7 @@ int client_request_handler(sock *client, int req_num) {
int snd_len = 0; int snd_len = 0;
while (snd_len < len) { while (snd_len < len) {
if (client->enc) { if (client->enc) {
ret = SSL_write(client->ssl, msg_buf, len - snd_len); ret = SSL_write(client->ssl, msg_buf, (int) (len - snd_len));
} else { } else {
ret = send(client->socket, msg_buf, len - snd_len, 0); ret = send(client->socket, msg_buf, len - snd_len, 0);
} }

7
src/http.h
View File

@ -118,6 +118,7 @@ const char *http_default_document =
" <title>%1$i %2$s</title>\n" " <title>%1$i %2$s</title>\n"
" <meta charset=\"UTF-8\"/>\n" " <meta charset=\"UTF-8\"/>\n"
" <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>\n" " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>\n"
"%5$s"
" <style>\n" " <style>\n"
" html {font-family: \"Arial\", sans-serif; --error: #C00000; --info: #E0C000; --color: var(--%4$s);}\n" " html {font-family: \"Arial\", sans-serif; --error: #C00000; --info: #E0C000; --color: var(--%4$s);}\n"
" body {background-color: #F0F0F0; margin: 0.5em;}\n" " body {background-color: #F0F0F0; margin: 0.5em;}\n"
@ -141,6 +142,12 @@ const char *http_error_document =
" <p>%3$s</p>\n" " <p>%3$s</p>\n"
" <p>%4$s</p>\n"; " <p>%4$s</p>\n";
const char *http_error_icon =
" <link rel=\"shortcut icon\" type=\"image/svg+xml\" sizes=\"any\" href=\"data:image/svg+xml;base64,"
"PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw"
"L3N2ZyI+PHRleHQgeD0iNCIgeT0iMTIiIGZpbGw9IiNDMDAwMDAiIHN0eWxlPSJmb250LWZhbWls"
"eTonQXJpYWwnLHNhbnMtc2VyaWYiPjooPC90ZXh0Pjwvc3ZnPgo=\"/>\n";
void http_to_camel_case(char *str); void http_to_camel_case(char *str);