Fix flines()

Small fixes in tcp_acceptor
Add Accept-Ranges lines
2023-01-11 15:07:01 +01:00 · 2023-01-11 14:49:06 +01:00 · 2023-01-11 14:30:12 +01:00 · 2023-01-11 11:06:36 +01:00 · 2023-01-11 00:34:17 +01:00 · 2023-01-10 23:54:47 +01:00
21 changed files with 462 additions and 188 deletions
--- a/2
+++ b/2
@@ -1,7 +1,7 @@

 CC=gcc
 CFLAGS=-std=gnu11 -Wno-unused-but-set-variable -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_POSIX_C_SOURCE=200809L
-LDFLAGS=-lssl -lcrypto -lmagic -lz -lmaxminddb -lbrotlienc
+LDFLAGS=-pthread -lssl -lcrypto -lmagic -lz -lmaxminddb -lbrotlienc

 DEBIAN_OPTS=-D CACHE_MAGIC_FILE="\"/usr/share/file/magic.mgc\"" -D PHP_FPM_SOCKET="\"/var/run/php/php7.4-fpm.sock\""

--- a/src/cache_handler.c
+++ b/src/cache_handler.c
@@ -25,7 +25,6 @@

 #define CACHE_BUF_SIZE 16

-
 static magic_t magic;
 static pthread_t thread;
 static sem_t sem_free, sem_used, sem_lock;
@@ -69,7 +68,7 @@ static cache_entry_t *cache_get_entry(cache_t *cache, const char *filename) {
    for (int i = 0; i < CACHE_ENTRIES; i++) {
        entry = &cache->entries[i];
        if (entry->filename[0] == 0) break;
-        if (strcmp(entry->filename, filename) == 0) {
+        if (streq(entry->filename, filename)) {
            // found
            return entry;
        }
@@ -243,6 +242,13 @@ int cache_init(void) {
        if (hc->type == CONFIG_TYPE_UNSET) break;
        if (hc->type != CONFIG_TYPE_LOCAL) continue;

+        sprintf(buf, "%s/.sesimos", hc->local.webroot);
+        if (mkdir(buf, 0755) != 0 && errno != EEXIST) {
+            critical("Unable to create directory %s", buf);
+            return 1;
+        }
+        errno = 0;
+
        sprintf(buf, "%s/.sesimos/metadata", hc->local.webroot);
        if ((fd = open(buf, O_CREAT | O_RDWR, 0600)) == -1) {
            critical("Unable to open file %s", buf);
@@ -337,9 +343,7 @@ static void cache_mark_entry_dirty(cache_entry_t *entry) {
 }

 static void cache_update_entry(cache_entry_t *entry, const char *filename, const char *webroot) {
-    struct stat statbuf;
-    stat(filename, &statbuf);
-    memcpy(&entry->meta.stat, &statbuf, sizeof(statbuf));
+    entry->meta.mtime = stat_mtime(filename);

    entry->webroot_len = (unsigned char) strlen(webroot);
    strcpy(entry->filename, filename);
@@ -348,10 +352,10 @@ static void cache_update_entry(cache_entry_t *entry, const char *filename, const
    const char *type = magic_file(magic, filename);
    char type_new[URI_TYPE_SIZE];
    sprintf(type_new, "%s", type);
-    if (strncmp(type, "text/", 5) == 0) {
-        if (strcmp(filename + strlen(filename) - 4, ".css") == 0) {
+    if (strstarts(type, "text/")) {
+        if (strends(filename, ".css")) {
            sprintf(type_new, "text/css");
-        } else if (strcmp(filename + strlen(filename) - 3, ".js") == 0) {
+        } else if (strends(filename, ".js")) {
            sprintf(type_new, "application/javascript");
        }
    }
@@ -387,9 +391,7 @@ void cache_init_uri(cache_t *cache, http_uri *uri) {
            return;

        // check, if file has changed
-        struct stat statbuf;
-        stat(uri->filename, &statbuf);
-        if (memcmp(&uri->meta->stat.st_mtime, &statbuf.st_mtime, sizeof(statbuf.st_mtime)) != 0) {
+        if (uri->meta->mtime != stat_mtime(uri->filename)) {
            // modify time has changed
            cache_update_entry(entry, uri->filename, uri->webroot);
        }
--- a/src/lib/config.c
+++ b/src/lib/config.c
@@ -8,6 +8,7 @@

 #include "../logger.h"
 #include "config.h"
+#include "utils.h"

 #include <stdio.h>
 #include <string.h>
@@ -133,7 +134,7 @@ int config_load(const char *filename) {
                } else {
                    hc->type = CONFIG_TYPE_REVERSE_PROXY;
                }
-            } else if (strcmp(ptr, "http") == 0) {
+            } else if (streq(ptr, "http")) {
                if (hc->type != 0 && hc->type != CONFIG_TYPE_REVERSE_PROXY) {
                    goto err;
                } else {
@@ -141,7 +142,7 @@ int config_load(const char *filename) {
                    hc->proxy.enc = 0;
                }
                continue;
-            } else if (strcmp(ptr, "https") == 0) {
+            } else if (streq(ptr, "https")) {
                if (hc->type != 0 && hc->type != CONFIG_TYPE_REVERSE_PROXY) {
                    goto err;
                } else {
@@ -166,11 +167,11 @@ int config_load(const char *filename) {
        if (target != NULL) {
            strcpy(target, source);
        } else if (mode == 1) {
-            if (strcmp(source, "forbidden") == 0) {
+            if (streq(source, "forbidden")) {
                config.hosts[i - 1].local.dir_mode = URI_DIR_MODE_FORBIDDEN;
-            } else if (strcmp(source, "info") == 0) {
+            } else if (streq(source, "info")) {
                config.hosts[i - 1].local.dir_mode = URI_DIR_MODE_INFO;
-            } else if (strcmp(source, "list") == 0) {
+            } else if (streq(source, "list")) {
                config.hosts[i - 1].local.dir_mode = URI_DIR_MODE_LIST;
            } else {
                goto err;
@@ -193,7 +194,7 @@ int config_load(const char *filename) {
        if (hc->cert_name[0] == 0) goto err2;
        int found = 0;
        for (int m = 0; m < j; m++) {
-            if (strcmp(config.certs[m].name, hc->cert_name) == 0) {
+            if (streq(config.certs[m].name, hc->cert_name)) {
                hc->cert = m;
                found = 1;
                break;
@@ -213,7 +214,7 @@ host_config_t *get_host_config(const char *host) {
    for (int i = 0; i < CONFIG_MAX_HOST_CONFIG; i++) {
        host_config_t *hc = &config.hosts[i];
        if (hc->type == CONFIG_TYPE_UNSET) break;
-        if (strcmp(hc->name, host) == 0) return hc;
+        if (streq(hc->name, host)) return hc;
        if (hc->name[0] == '*' && hc->name[1] == '.') {
            const char *pos = strstr(host, hc->name + 1);
            if (pos != NULL && strlen(pos) == strlen(hc->name + 1)) return hc;
--- a/src/lib/error.c
+++ b/src/lib/error.c
@@ -10,6 +10,7 @@
 #include "http.h"

 #include <errno.h>
+#include <string.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <maxminddb.h>
@@ -34,8 +35,8 @@ static const char *error_ssl_strerror(int err) {
            return "want async job";
        case SSL_ERROR_WANT_CLIENT_HELLO_CB:
            return "want client hello callback";
-        case SSL_ERROR_WANT_RETRY_VERIFY:
-            return "want retry verify";
+        //case SSL_ERROR_WANT_RETRY_VERIFY:
+        //    return "want retry verify";
        case SSL_ERROR_SSL:
            return ERR_reason_error_string(ERR_get_error());
        default:
--- a/src/lib/fastcgi.c
+++ b/src/lib/fastcgi.c
@@ -6,6 +6,7 @@
 * @date 2020-12-26
 */

+#include "../defs.h"
 #include "fastcgi.h"
 #include "utils.h"
 #include "compress.h"
@@ -16,13 +17,11 @@
 #include <sys/socket.h>
 #include <string.h>

-
 char *fastcgi_add_param(char *buf, const char *key, const char *value) {
    char *ptr = buf;
    unsigned long key_len = strlen(key);
    unsigned long val_len = strlen(value);

-
    if (key_len <= 127) {
        ptr[0] = (char) (key_len & 0x7F);
        ptr++;
@@ -44,9 +43,9 @@ char *fastcgi_add_param(char *buf, const char *key, const char *value) {
        ptr += 4;
    }

-    strcpy(ptr, key);
+    memcpy(ptr, key, key_len);
    ptr += key_len;
-    strcpy(ptr, value);
+    memcpy(ptr, value, val_len);
    ptr += val_len;

    return ptr;
@@ -117,13 +116,13 @@ int fastcgi_init(fastcgi_cnx_t *conn, int mode, unsigned int req_num, const sock
    socklen_t len = sizeof(addr_storage);
    getsockname(client->socket, (struct sockaddr *) &addr_storage, &len);
    addr = (struct sockaddr_in6 *) &addr_storage;
-    sprintf(buf0, "%i", addr->sin6_port);
+    sprintf(buf0, "%i", ntohs(addr->sin6_port));
    param_ptr = fastcgi_add_param(param_ptr, "SERVER_PORT", buf0);

    len = sizeof(addr_storage);
    getpeername(client->socket, (struct sockaddr *) &addr_storage, &len);
    addr = (struct sockaddr_in6 *) &addr_storage;
-    sprintf(buf0, "%i", addr->sin6_port);
+    sprintf(buf0, "%i", ntohs(addr->sin6_port));
    param_ptr = fastcgi_add_param(param_ptr, "REMOTE_PORT", buf0);
    param_ptr = fastcgi_add_param(param_ptr, "REMOTE_ADDR", conn->r_addr);
    param_ptr = fastcgi_add_param(param_ptr, "REMOTE_HOST", conn->r_host != NULL ? conn->r_host : conn->r_addr);
@@ -153,7 +152,7 @@ int fastcgi_init(fastcgi_cnx_t *conn, int mode, unsigned int req_num, const sock
    //    param_ptr = fastcgi_add_param(param_ptr, "REMOTE_INFO", conn->ctx->geoip);
    //}

-    for (int i = 0; i < list_size(&req->hdr); i++) {
+    for (int i = 0; i < list_size(req->hdr.fields); i++) {
        const http_field *f = &req->hdr.fields[i];
        const char *name = http_field_get_name(f);
        char *ptr = buf0;
@@ -237,16 +236,16 @@ int fastcgi_php_error(const fastcgi_cnx_t *conn, const char *msg, int msg_len, c
            goto next;
        }

-        if (len >= 14 && strncmp(ptr0, "PHP Warning:  ", 14) == 0) {
+        if (len >= 14 && strstarts(ptr0, "PHP Warning:  ")) {
            msg_type = LOG_WARNING;
            msg_pre_len = 14;
-        } else if (len >= 18 && strncmp(ptr0, "PHP Fatal error:  ", 18) == 0) {
+        } else if (len >= 18 && strstarts(ptr0, "PHP Fatal error:  ")) {
            msg_type = LOG_ERROR;
            msg_pre_len = 18;
-        } else if (len >= 18 && strncmp(ptr0, "PHP Parse error:  ", 18) == 0) {
+        } else if (len >= 18 && strstarts(ptr0, "PHP Parse error:  ")) {
            msg_type = LOG_ERROR;
            msg_pre_len = 18;
-        } else if (len >= 18 && strncmp(ptr0, "PHP Notice:  ", 13) == 0) {
+        } else if (len >= 18 && strstarts(ptr0, "PHP Notice:  ")) {
            msg_type = LOG_NOTICE;
            msg_pre_len = 13;
        }
--- a/src/lib/geoip.c
+++ b/src/lib/geoip.c
@@ -9,6 +9,7 @@
 #include "geoip.h"
 #include "../logger.h"
 #include "error.h"
+#include "utils.h"
 #include <memory.h>
 #include <dirent.h>

@@ -91,7 +92,7 @@ int geoip_init(const char *directory) {
    struct dirent *entry;
    int i = 0, status;
    while ((entry = readdir(geoip_dir)) != NULL) {
-        if (strcmp(entry->d_name + strlen(entry->d_name) - 5, ".mmdb") != 0)
+        if (!strends(entry->d_name, ".mmdb"))
            continue;

        if (i >= GEOIP_MAX_MMDB) {
--- a/src/lib/http.c
+++ b/src/lib/http.c
@@ -390,15 +390,15 @@ const char *http_get_status_color(const http_status *status) {
 }

 char *http_format_date(time_t time, char *buf, size_t size) {
-    struct tm timeinfo;
-    strftime(buf, size, "%a, %d %b %Y %H:%M:%S GMT", gmtime_r(&time, &timeinfo));
+    struct tm time_info;
+    strftime(buf, size, "%a, %d %b %Y %H:%M:%S GMT", gmtime_r(&time, &time_info));
    return buf;
 }

 char *http_get_date(char *buf, size_t size) {
-    time_t rawtime;
-    time(&rawtime);
-    return http_format_date(rawtime, buf, size);
+    time_t raw_time;
+    time(&raw_time);
+    return http_format_date(raw_time, buf, size);
 }

 const http_doc_info *http_get_status_info(const http_status *status) {
@@ -426,9 +426,9 @@ int http_get_compression(const http_req *req, const http_res *res) {
    const char *content_type = http_get_header_field(&res->hdr, "Content-Type");
    const char *content_encoding = http_get_header_field(&res->hdr, "Content-Encoding");
    if (mime_is_compressible(content_type) && content_encoding == NULL && accept_encoding != NULL) {
-        if (strstr(accept_encoding, "br") != NULL) {
+        if (strcontains(accept_encoding, "br")) {
            return COMPRESS_BR;
-        } else if (strstr(accept_encoding, "gzip") != NULL) {
+        } else if (strcontains(accept_encoding, "gzip")) {
            return COMPRESS_GZ;
        }
    }
--- a/src/lib/http.h
+++ b/src/lib/http.h
@@ -52,7 +52,6 @@
 #define HTTP_ERROR_HEADER_MALFORMED 5
 #define HTTP_ERROR_INVALID_VERSION 6
 #define HTTP_ERROR_URI_TOO_LONG 7
-#define HTTP_ERROR_

 #ifndef SERVER_STR
 #   define SERVER_STR "sesimos"
--- a/src/lib/proxy.c
+++ b/src/lib/proxy.c
@@ -398,10 +398,10 @@ int proxy_init(proxy_ctx_t **proxy_ptr, http_req *req, http_res *res, http_statu

    proxy:
    connection = http_get_header_field(&req->hdr, "Connection");
-    if (connection != NULL && (strstr(connection, "upgrade") != NULL || strstr(connection, "Upgrade") != NULL)) {
+    if (strcontains(connection, "upgrade") || strcontains(connection, "Upgrade")) {
        upgrade = http_get_header_field(&req->hdr, "Upgrade");
        ws_version = http_get_header_field(&req->hdr, "Sec-WebSocket-Version");
-        if (upgrade != NULL && ws_version != NULL && strcmp(upgrade, "websocket") == 0 && strcmp(ws_version, "13") == 0) {
+        if (streq(upgrade, "websocket") && streq(ws_version, "13")) {
            ctx->ws_key = http_get_header_field(&req->hdr, "Sec-WebSocket-Key");
        } else {
            res->status = http_get_status(501);
@@ -437,7 +437,7 @@ int proxy_init(proxy_ctx_t **proxy_ptr, http_req *req, http_res *res, http_statu
    ret = 0;
    if (content_len > 0) {
        ret = sock_splice(&proxy->proxy, client, buffer, sizeof(buffer), content_len);
-    } else if (transfer_encoding != NULL && strstr(transfer_encoding, "chunked") != NULL) {
+    } else if (strcontains(transfer_encoding, "chunked")) {
        ret = sock_splice_chunked(&proxy->proxy, client, buffer, sizeof(buffer));
    }

@@ -510,7 +510,7 @@ int proxy_init(proxy_ctx_t **proxy_ptr, http_req *req, http_res *res, http_statu
            goto proxy_err;
        }
        if (ptr == buf) {
-            if (strncmp(ptr, "HTTP/", 5) != 0) {
+            if (!strstarts(ptr, "HTTP/")) {
                res->status = http_get_status(502);
                ctx->origin = SERVER_RES;
                error("Unable to parse header: Invalid header format");
--- a/src/lib/uri.c
+++ b/src/lib/uri.c
@@ -15,21 +15,26 @@


 int path_is_directory(const char *path) {
-    struct stat statbuf;
-    return stat(path, &statbuf) == 0 && S_ISDIR(statbuf.st_mode) != 0;
+    int e = errno;
+    struct stat stat_buf;
+    int ret = stat(path, &stat_buf);
+    errno = e;
+    return ret == 0 && S_ISDIR(stat_buf.st_mode) != 0;
 }

 int path_is_file(const char *path) {
-    struct stat statbuf;
-    int ret = stat(path, &statbuf);
-    errno = 0;
-    return ret == 0 && S_ISDIR(statbuf.st_mode) == 0;
+    int e = errno;
+    struct stat stat_buf;
+    int ret = stat(path, &stat_buf);
+    errno = e;
+    return ret == 0 && S_ISDIR(stat_buf.st_mode) == 0;
 }

 int path_exists(const char *path) {
-    struct stat statbuf;
-    int ret = stat(path, &statbuf);
-    errno = 0;
+    int e = errno;
+    struct stat stat_buf;
+    int ret = stat(path, &stat_buf);
+    errno = e;
    return ret == 0;
 }

@@ -73,7 +78,7 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
    if (query != NULL) {
        query[-1] = '?';
    }
-    if (strstr(uri->req_path, "/../") != NULL || strstr(uri->req_path, "/./") != NULL) {
+    if (strcontains(uri->req_path, "/../") || strcontains(uri->req_path, "/./")) {
        return 2;
    }

@@ -140,10 +145,10 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
        uri->filename = malloc(strlen(buf0) + 1);
        strcpy(uri->filename, buf0);
        long len = (long) strlen(uri->path);
-        if (strcmp(uri->path + len - 4, ".ncr") == 0 || strcmp(uri->path + len - 4, ".php") == 0) {
+        if (strends(uri->path, ".ncr") || strends(uri->path, ".php")) {
            uri->path[len - 4] = 0;
            uri->is_static = 0;
-        } else if (strcmp(uri->path + len - 5, ".html") == 0) {
+        } else if (strends(uri->path, ".html")) {
            uri->path[len - 5] = 0;
        }
    } else if (path_is_file(buf1)) {
@@ -190,12 +195,12 @@ int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mo
        }
    }

-    if (strcmp(uri->path + strlen(uri->path) - 5, "index") == 0) {
+    if (strends(uri->path + strlen(uri->path), "index")) {
        uri->path[strlen(uri->path) - 5] = 0;
    }
-    if (strcmp(uri->pathinfo, "index.ncr") == 0 ||
-        strcmp(uri->pathinfo, "index.php") == 0 ||
-        strcmp(uri->pathinfo, "index.html") == 0) {
+    if (streq(uri->pathinfo, "index.ncr") ||
+        streq(uri->pathinfo, "index.php") ||
+        streq(uri->pathinfo, "index.html")) {
        uri->pathinfo[0] = 0;
    }

--- a/src/lib/uri.h
+++ b/src/lib/uri.h
@@ -26,7 +26,7 @@ typedef struct {
    char charset[URI_CHARSET_SIZE];
    char filename_comp_gz[256];
    char filename_comp_br[256];
-    struct stat stat;
+    long mtime;
 } metadata_t;

 typedef struct {
--- a/src/lib/utils.c
+++ b/src/lib/utils.c
@@ -12,6 +12,10 @@
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <unistd.h>
+#include <dirent.h>


 static const char base64_encode_table[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -113,34 +117,44 @@ int url_decode(const char *str, char *dec, long *size) {
    return 0;
 }

-int mime_is_compressible(const char *type) {
+int mime_is_compressible(const char *restrict type) {
    if (type == NULL) return 0;
    char type_parsed[64];
    snprintf(type_parsed, sizeof(type_parsed), "%s", type);
    char *pos = strchr(type_parsed, ';');
    if (pos != NULL) pos[0] = 0;
    return
-        strncmp(type_parsed, "text/", 5) == 0 ||
-        strncmp(type_parsed, "message/", 7) == 0 ||
-        strstr(type_parsed, "+xml") != NULL ||
-        strstr(type_parsed, "+json") != NULL ||
-        strcmp(type_parsed, "application/javascript") == 0 ||
-        strcmp(type_parsed, "application/json") == 0 ||
-        strcmp(type_parsed, "application/xml") == 0 ||
-        strcmp(type_parsed, "application/x-www-form-urlencoded") == 0 ||
-        strcmp(type_parsed, "application/x-tex") == 0 ||
-        strcmp(type_parsed, "application/x-httpd-php") == 0 ||
-        strcmp(type_parsed, "application/x-latex") == 0 ||
-        strcmp(type_parsed, "application/vnd.ms-fontobject") == 0 ||
-        strcmp(type_parsed, "application/x-font-ttf") == 0 ||
-        strcmp(type_parsed, "application/x-javascript") == 0 ||
-        strcmp(type_parsed, "font/eot") == 0 ||
-        strcmp(type_parsed, "font/opentype") == 0 ||
-        strcmp(type_parsed, "image/bmp") == 0 ||
-        strcmp(type_parsed, "image/gif") == 0 ||
-        strcmp(type_parsed, "image/vnd.microsoft.icon") == 0 ||
-        strcmp(type_parsed, "image/vnd.microsoft.iconbinary") == 0 ||
-        strcmp(type_parsed, "image/x-icon") == 0;
+        mime_is_text(type) ||
+        streq(type_parsed, "application/vnd.ms-fontobject") ||
+        streq(type_parsed, "application/x-font-ttf") ||
+        streq(type_parsed, "font/eot") ||
+        streq(type_parsed, "font/opentype") ||
+        streq(type_parsed, "image/bmp") ||
+        streq(type_parsed, "image/gif") ||
+        streq(type_parsed, "image/vnd.microsoft.icon") ||
+        streq(type_parsed, "image/vnd.microsoft.iconbinary") ||
+        streq(type_parsed, "image/x-icon");
+}
+
+int mime_is_text(const char *restrict type) {
+    if (type == NULL) return 0;
+    char type_parsed[64];
+    snprintf(type_parsed, sizeof(type_parsed), "%s", type);
+    char *pos = strchr(type_parsed, ';');
+    if (pos != NULL) pos[0] = 0;
+    return
+        strstarts(type_parsed, "text/") ||
+        strstarts(type_parsed, "message/") ||
+        strends(type_parsed, "+xml") ||
+        strends(type_parsed, "+json") ||
+        streq(type_parsed, "application/javascript") ||
+        streq(type_parsed, "application/json") ||
+        streq(type_parsed, "application/xml") ||
+        streq(type_parsed, "application/x-www-form-urlencoded") ||
+        streq(type_parsed, "application/x-tex") ||
+        streq(type_parsed, "application/x-httpd-php") ||
+        streq(type_parsed, "application/x-latex") ||
+        streq(type_parsed, "application/x-javascript");
 }

 int strcpy_rem_webroot(char *dst, const char *src, long len, const char *webroot) {
@@ -183,6 +197,26 @@ int str_trim_lws(char **start, char **end) {
    return 0;
 }

+int streq(const char *restrict str1, const char *restrict str2) {
+    return str1 != NULL && str2 != NULL && strcmp(str1, str2) == 0;
+}
+
+int strcontains(const char *restrict haystack, const char *restrict needle) {
+    return haystack != NULL && needle != NULL && strstr(haystack, needle) != NULL;
+}
+
+int strstarts(const char *restrict str, const char *restrict prefix) {
+    if (str == NULL || prefix == NULL) return 0;
+    unsigned long l1 = strlen(str), l2 = strlen(prefix);
+    return l2 <= l1 && strncmp(str, prefix, l2) == 0;
+}
+
+int strends(const char *restrict str, const char *restrict suffix) {
+    if (str == NULL || suffix == NULL) return 0;
+    unsigned long l1 = strlen(str), l2 = strlen(suffix);
+    return l2 <= l1 && strcmp(str + l1 - l2, suffix) == 0;
+}
+
 int base64_encode(void *data, unsigned long data_len, char *output, unsigned long *output_len) {
    unsigned long out_len = 4 * ((data_len + 2) / 3);
    if (output_len != NULL) *output_len = out_len;
@@ -216,3 +250,136 @@ long clock_cpu(void) {
    clock_gettime(CLOCK_THREAD_CPUTIME_ID, &time);
    return time.tv_sec * 1000000000 + time.tv_nsec;
 }
+
+long stat_mtime(const char *filename) {
+    struct stat stat_buf;
+    stat(filename, &stat_buf);
+    return stat_buf.st_mtime;
+}
+
+int rm_rf(const char *path) {
+    struct stat stat_buf;
+    if (lstat(path, &stat_buf) != 0)
+        return (errno == ENOENT) ? 0 : -1;
+
+    if (S_ISREG(stat_buf.st_mode)) {
+        // regular file
+        return unlink(path);
+    } else if (S_ISLNK(stat_buf.st_mode)) {
+        // link
+        return unlink(path);
+    } else if (S_ISDIR(stat_buf.st_mode)) {
+        // directory
+        char buf[FILENAME_MAX];
+        DIR *dir;
+
+        // open directory
+        if ((dir = opendir(path)) == NULL)
+            return -1;
+
+        // read directory
+        for (struct dirent *ent; (ent = readdir(dir)) != NULL;) {
+            if (streq(ent->d_name, ".") || streq(ent->d_name, ".."))
+                continue;
+
+            snprintf(buf, sizeof(buf), "%s/%s", path, ent->d_name);
+            if (rm_rf(buf) != 0) {
+                closedir(dir);
+                return -1;
+            }
+        }
+
+        // close and remove directory
+        closedir(dir);
+        return rmdir(path);
+    } else {
+        // other - not supported
+        errno = ENOTSUP;
+        return -1;
+    }
+}
+
+long fsize(FILE *file) {
+    long cur_pos, len;
+    if ((cur_pos = ftell(file)) == -1)
+        return -1;
+    if (fseek(file, 0, SEEK_END) != 0)
+        return -1;
+    if ((len = ftell(file)) == -1)
+        return -1;
+    if (fseek(file, cur_pos, SEEK_SET) != 0)
+        return -1;
+    return len;
+}
+
+long flines(FILE *file) {
+    long cur_pos, lines = 0;
+    if ((cur_pos = ftell(file)) == -1)
+        return -1;
+    if (fseek(file, 0, SEEK_SET) != 0)
+        return -1;
+
+    for (int ch; (ch = fgetc(file)) != EOF;) {
+        if (ch == '\n') lines++;
+    }
+
+    if (fseek(file, cur_pos, SEEK_SET) != 0)
+        return -1;
+    return lines + 1;
+}
+
+long file_get_line_pos(FILE *file, long line_num) {
+    if (line_num < 1) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    long cur_pos;
+    if ((cur_pos = ftell(file)) == -1)
+        return -1;
+    if (fseek(file, 0, SEEK_SET) != 0)
+        return -1;
+
+    long lines = 0, pos = 0;
+    for (int ch; lines < line_num - 1 && (ch = fgetc(file)) != EOF; pos++) {
+        if (ch == '\n') lines++;
+    }
+
+    if (fseek(file, cur_pos, SEEK_SET) != 0)
+        return -1;
+    return pos;
+}
+
+int fseekl(FILE *file, long line_num) {
+    if (line_num < 1) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    if (fseek(file, 0, SEEK_SET) != 0)
+        return -1;
+
+    long lines = 0;
+    for (int ch; lines < line_num - 1 && (ch = fgetc(file)) != EOF;) {
+        if (ch == '\n') lines++;
+    }
+
+    return 0;
+}
+
+long ftelll(FILE *file) {
+    long cur_pos;
+    if ((cur_pos = ftell(file)) == -1)
+        return -1;
+    if (fseek(file, 0, SEEK_SET) != 0)
+        return -1;
+
+    long lines = 0, pos = 0;
+    for (int ch; pos < cur_pos && (ch = fgetc(file)) != EOF; pos++) {
+        if (ch == '\n') lines++;
+    }
+
+    if (fseek(file, cur_pos, SEEK_SET) != 0)
+        return -1;
+    return lines + 1;
+}
--- a/src/lib/utils.h
+++ b/src/lib/utils.h
@@ -27,7 +27,9 @@ int url_encode(const void *in, size_t size_in, char *out, size_t size_out);

 int url_decode(const char *str, char *dec, long *size);

-int mime_is_compressible(const char *type);
+int mime_is_compressible(const char *restrict type);
+
+int mime_is_text(const char *restrict type);

 int strcpy_rem_webroot(char *dst, const char *str, long len, const char *webroot);

@@ -35,10 +37,32 @@ int str_trim(char **start, char **end);

 int str_trim_lws(char **start, char **end);

+int streq(const char *restrict str1, const char *restrict str2);
+
+int strcontains(const char *restrict haystack, const char *restrict needle);
+
+int strstarts(const char *restrict str, const char *restrict prefix);
+
+int strends(const char *restrict str, const char *restrict suffix);
+
 int base64_encode(void *data, unsigned long data_len, char *output, unsigned long *output_len);

 long clock_micros(void);

 long clock_cpu(void);

+long stat_mtime(const char *filename);
+
+int rm_rf(const char *path);
+
+long fsize(FILE *file);
+
+long flines(FILE *file);
+
+long file_get_line_pos(FILE *file, long line_num);
+
+int fseekl(FILE *file, long line_num);
+
+long ftelll(FILE *file);
+
 #endif //SESIMOS_UTILS_H
--- a/src/logger.c
+++ b/src/logger.c
@@ -278,4 +278,9 @@ int logger_init(void) {

 void logger_stop(void) {
    alive = 0;
+    pthread_kill(thread, SIGUSR1);
+}
+
+int logger_join(void) {
+    return pthread_join(thread, NULL);
 }
--- a/src/logger.h
+++ b/src/logger.h
@@ -37,4 +37,6 @@ int logger_init(void);

 void logger_stop(void);

+int logger_join(void);
+
 #endif //SESIMOS_LOGGER_H
--- a/src/server.c
+++ b/src/server.c
@@ -33,20 +33,40 @@
 #include <openssl/ssl.h>
 #include <openssl/conf.h>

-
 const char *config_file;
-
 static int sockets[NUM_SOCKETS];
 static SSL_CTX *contexts[CONFIG_MAX_CERT_CONFIG];
-
 static client_ctx_t **clients;

-static const char *color_table[] = {"\x1B[31m", "\x1B[32m", "\x1B[33m", "\x1B[34m", "\x1B[35m", "\x1B[36m"};
+static void clean(void) {
+    notice("Cleaning sesimos cache and metadata files...");

-static int clean() {
-    remove("/var/sesimos/server/cache");
-    rmdir("/var/sesimos/server/");
-    return 0;
+    // remove legacy files
+    //     /.../server/, /.../server/cache
+    if (rm_rf("/var/sesimos/server") != 0) {
+        error("Unable to remove /var/sesimos/server/");
+    } else if (!errno) {
+        notice("Successfully removed /var/sesimos/server/");
+    }
+    errno = 0;
+
+    // remove cache and metadata files
+    char buf[512];
+    for (int i = 0; i < CONFIG_MAX_HOST_CONFIG; i++) {
+        host_config_t *hc = &config.hosts[i];
+        if (hc->type == CONFIG_TYPE_UNSET) break;
+        if (hc->type != CONFIG_TYPE_LOCAL) continue;
+
+        snprintf(buf, sizeof(buf), "%s/.sesimos", hc->local.webroot);
+        if (rm_rf(buf) != 0) {
+            error("Unable to remove %s/", buf);
+        } else if (!errno) {
+            notice("Successfully removed %s/", buf);
+        }
+        errno = 0;
+    }
+
+    notice("Cleaned all sesimos cache and metadata files!");
 }

 static int ssl_servername_cb(SSL *ssl, int *ad, void *arg) {
@@ -154,6 +174,7 @@ static void nothing(int sig) {}
 int main(int argc, char *const argv[]) {
    const int YES = 1;
    int ret;
+    int mode = 0;

    memset(sockets, 0, sizeof(sockets));
    clients = list_create(sizeof(void *), 64);
@@ -167,8 +188,6 @@ int main(int argc, char *const argv[]) {
            {.sin6_family = AF_INET6, .sin6_addr = IN6ADDR_ANY_INIT, .sin6_port = htons(443)}
    };

-    logger_init();
-
    logger_set_name("server");

    if (setvbuf(stdout, NULL, _IOLBF, 0) != 0 || setvbuf(stderr, NULL, _IOLBF, 0) != 0) {
@@ -179,13 +198,13 @@ int main(int argc, char *const argv[]) {

    static const struct option long_opts[] = {
            {"help",    no_argument,        0, 'h'},
+            {"clean",   no_argument,        0, 'C'},
            {"config",  required_argument,  0, 'c'},
            { 0,        0,                  0,  0 }
    };

    config_file = NULL;
-    int c, opt_idx;
-    while ((c = getopt_long(argc, argv, "hc:", long_opts, &opt_idx)) != -1) {
+    for (int c, opt_idx; (c = getopt_long(argc, argv, "hCc:", long_opts, &opt_idx)) != -1;) {
        switch (c) {
            case 'h':
                fprintf(stderr,
@@ -193,11 +212,15 @@ int main(int argc, char *const argv[]) {
                        "\n"
                        "Options:\n"
                        "  -c, --config <CONFIG-FILE>  path to the config file. If not provided, default will be used\n"
+                        "  -C, --clean                 clear cached files and other metadata\n"
                        "  -h, --help                  print this dialogue\n");
                return 0;
            case 'c':
                config_file = optarg;
                break;
+            case 'C':
+                mode = 1;
+                break;
            case '?':
            default:
                critical("Unable to parse arguments");
@@ -213,6 +236,11 @@ int main(int argc, char *const argv[]) {
    if (config_load(config_file == NULL ? DEFAULT_CONFIG_FILE : config_file) != 0)
        return 1;

+    if (mode == 1) {
+        clean();
+        return 0;
+    }
+
    if ((sockets[0] = socket(AF_INET6, SOCK_STREAM, 0)) == -1 ||
        (sockets[1] = socket(AF_INET6, SOCK_STREAM, 0)) == -1)
    {
@@ -303,6 +331,9 @@ int main(int argc, char *const argv[]) {
        }
    }

+    logger_init();
+    logger_set_name("server");
+
    workers_init();

    for (int i = 0; i < NUM_SOCKETS; i++) {
@@ -321,5 +352,7 @@ int main(int argc, char *const argv[]) {
    proxy_unload();
    cache_join();
    async_free();
+    logger_stop();
+    logger_join();
    return 0;
 }
--- a/src/worker/fastcgi_handler.c
+++ b/src/worker/fastcgi_handler.c
@@ -46,9 +46,9 @@ static int fastcgi_handler_1(client_ctx_t *ctx, fastcgi_cnx_t *fcgi_cnx) {
    char buf[1024];

    int mode, ret;
-    if (strcmp(uri->filename + strlen(uri->filename) - 4, ".ncr") == 0) {
+    if (strends(uri->filename, ".ncr")) {
        mode = FASTCGI_SESIMOS;
-    } else if (strcmp(uri->filename + strlen(uri->filename) - 4, ".php") == 0) {
+    } else if (strends(uri->filename, ".php")) {
        mode = FASTCGI_PHP;
    } else {
        res->status = http_get_status(500);
@@ -73,7 +73,7 @@ static int fastcgi_handler_1(client_ctx_t *ctx, fastcgi_cnx_t *fcgi_cnx) {
    if (client_content_length != NULL) {
        unsigned long client_content_len = strtoul(client_content_length, NULL, 10);
        ret = fastcgi_receive(fcgi_cnx, client, client_content_len);
-    } else if (client_transfer_encoding != NULL && strstr(client_transfer_encoding, "chunked") != NULL) {
+    } else if (strcontains(client_transfer_encoding, "chunked")) {
        ret = fastcgi_receive_chunked(fcgi_cnx, client);
    } else {
        ret = 0;
@@ -118,7 +118,7 @@ static int fastcgi_handler_1(client_ctx_t *ctx, fastcgi_cnx_t *fcgi_cnx) {
    const char *content_encoding = http_get_header_field(&res->hdr, "Content-Encoding");
    if (content_encoding == NULL &&
        content_type != NULL &&
-        strncmp(content_type, "text/html", 9) == 0 &&
+        strstarts(content_type, "text/html") &&
        ctx->content_length != -1 &&
        ctx->content_length <= sizeof(ctx->msg_content) - 1)
    {
@@ -157,7 +157,7 @@ static int fastcgi_handler_1(client_ctx_t *ctx, fastcgi_cnx_t *fcgi_cnx) {

 static int fastcgi_handler_2(client_ctx_t *ctx, fastcgi_cnx_t *fcgi_cnx) {
    const char *transfer_encoding = http_get_header_field(&ctx->res.hdr, "Transfer-Encoding");
-    int chunked = (transfer_encoding != NULL && strstr(transfer_encoding, "chunked") != NULL);
+    int chunked = strcontains(transfer_encoding, "chunked");

    int flags = (chunked ? FASTCGI_CHUNKED : 0) | (ctx->use_fastcgi & (FASTCGI_COMPRESS | FASTCGI_COMPRESS_HOLD));
    int ret = fastcgi_send(fcgi_cnx, &ctx->socket, flags);
--- a/src/worker/local_handler.c
+++ b/src/worker/local_handler.c
@@ -36,6 +36,76 @@ void local_handler_func(client_ctx_t *ctx) {
    }
 }

+static int range_handler(client_ctx_t *ctx) {
+    char buf[64];
+    long num0, num1, num2;
+    char *ptr;
+    int mode;
+    const char *range = http_get_header_field(&ctx->req.hdr, "Range");
+
+    if (strcontains(range, ","))
+        return -1;
+
+    ctx->file = fopen(ctx->uri.filename, "rb");
+
+    if (strstarts(range, "bytes=")) {
+        mode = 0;
+        range += 6;
+        num0 = fsize(ctx->file), num1 = 0, num2 = num0 - 1;
+        sprintf(buf, "bytes */%li", num0);
+    } else if (strstarts(range, "lines=") && mime_is_text(ctx->uri.meta->type)) {
+        mode = 1;
+        range += 6;
+        num0 = flines(ctx->file), num1 = 1, num2 = num0;
+        sprintf(buf, "lines */%li", num0);
+    } else {
+        return -1;
+    }
+
+    http_add_header_field(&ctx->res.hdr, "Content-Range", buf);
+
+    if ((ptr = strchr(range, '-')) == NULL)
+        return -1;
+
+    if (num0 == 0) {
+        ctx->content_length = 0;
+        return 0;
+    }
+
+    if (ptr[1] != 0) num2 = (long) strtoul(ptr + 1, NULL, 10);
+    if (ptr != range) {
+        num1 = (long) strtoul(range, NULL, 10);
+    } else {
+        if (mode == 0) {
+            num1 = num0 - num2 - 1;
+            num2 = num0 - 1;
+        } else if (mode == 1) {
+            num1 = num0 - num2 + 1;
+            num2 = num0;
+        }
+    }
+
+    if ((mode == 0 && (num1 >= num0 || num2 >= num0 || num1 > num2 || num1 < 0 || num2 < 0)) ||
+        (mode == 1 && (num1 > num0 || num2 > num0 || num1 > num2 || num1 <= 0 || num2 <= 0)))
+    {
+        return -1;
+    }
+
+    sprintf(buf, "%s %li-%li/%li", (mode == 0) ? "bytes" : "lines", num1, num2, num0);
+    http_remove_header_field(&ctx->res.hdr, "Content-Range", HTTP_REMOVE_ALL);
+    http_add_header_field(&ctx->res.hdr, "Content-Range", buf);
+
+    if (mode == 0) {
+        fseek(ctx->file, num1, SEEK_SET);
+        ctx->content_length = num2 - num1 + 1;
+    } else if (mode == 1) {
+        fseekl(ctx->file, num1);
+        ctx->content_length = file_get_line_pos(ctx->file, num2 + 1) - file_get_line_pos(ctx->file, num1);
+    }
+
+    return 0;
+}
+
 static int local_handler(client_ctx_t *ctx) {
    http_res *res = &ctx->res;
    http_req *req = &ctx->req;
@@ -45,14 +115,14 @@ static int local_handler(client_ctx_t *ctx) {
    char buf1[1024], buf2[1024];
    int accept_if_modified_since = 0;

-    if (strcmp(req->method, "TRACE") == 0) {
+    if (streq(req->method, "TRACE")) {
        res->status = http_get_status(200);
        http_add_header_field(&res->hdr, "Content-Type", "message/http");

        ctx->msg_buf_ptr = malloc(4096);
        ctx->msg_buf = ctx->msg_buf_ptr;
        ctx->content_length = snprintf(ctx->msg_buf, 4096 - ctx->content_length, "%s %s HTTP/%s\r\n", req->method, req->uri, req->version);
-        for (int i = 0; i < list_size(&req->hdr); i++) {
+        for (int i = 0; i < list_size(req->hdr.fields); i++) {
            const http_field *f = &req->hdr.fields[i];
            ctx->content_length += snprintf(ctx->msg_buf + ctx->content_length, 4096 - ctx->content_length, "%s: %s\r\n", http_field_get_name(f), http_field_get_value(f));
        }
@@ -60,11 +130,11 @@ static int local_handler(client_ctx_t *ctx) {
        return 0;
    }

-    if (strncmp(uri->req_path, "/.well-known/", 13) == 0) {
+    if (strstarts(uri->req_path, "/.well-known/")) {
        http_add_header_field(&res->hdr, "Access-Control-Allow-Origin", "*");
    }

-    if (strncmp(uri->req_path, "/.well-known/", 13) != 0 && strstr(uri->path, "/.") != NULL) {
+    if (!strstarts(uri->req_path, "/.well-known/") && strcontains(uri->path, "/.")) {
        res->status = http_get_status(403);
        sprintf(err_msg, "Parts of this URI are hidden.");
        return 0;
@@ -87,8 +157,11 @@ static int local_handler(client_ctx_t *ctx) {

    if (uri->is_static) {
        res->status = http_get_status(200);
-        http_add_header_field(&res->hdr, "Accept-Ranges", "bytes");
-        if (strcmp(req->method, "GET") != 0 && strcmp(req->method, "HEAD") != 0) {
+        cache_init_uri(ctx->conf->cache, uri);
+
+        http_add_header_field(&res->hdr, "Accept-Ranges", mime_is_text(uri->meta->type) ? "bytes, lines" : "bytes");
+
+        if (!streq(req->method, "GET") && !streq(req->method, "HEAD")) {
            res->status = http_get_status(405);
            return 0;
        }
@@ -99,18 +172,15 @@ static int local_handler(client_ctx_t *ctx) {
            return 0;
        }

-        cache_init_uri(ctx->conf->cache, uri);
-
-        const char *last_modified = http_format_date(uri->meta->stat.st_mtime, buf1, sizeof(buf1));
+        const char *last_modified = http_format_date(uri->meta->mtime, buf1, sizeof(buf1));
        http_add_header_field(&res->hdr, "Last-Modified", last_modified);
        sprintf(buf2, "%s; charset=%s", uri->meta->type, uri->meta->charset);
        http_add_header_field(&res->hdr, "Content-Type", buf2);

-
        const char *accept_encoding = http_get_header_field(&req->hdr, "Accept-Encoding");
        int enc = 0;
        if (accept_encoding != NULL) {
-            if (uri->meta->filename_comp_br[0] != 0 && strstr(accept_encoding, "br") != NULL) {
+            if (uri->meta->filename_comp_br[0] != 0 && strcontains(accept_encoding, "br")) {
                ctx->file = fopen(uri->meta->filename_comp_br, "rb");
                if (ctx->file == NULL) {
                    cache_mark_dirty(ctx->conf->cache, uri->filename);
@@ -119,7 +189,7 @@ static int local_handler(client_ctx_t *ctx) {
                    http_add_header_field(&res->hdr, "Content-Encoding", "br");
                    enc = COMPRESS_BR;
                }
-            } else if (uri->meta->filename_comp_gz[0] != 0 && strstr(accept_encoding, "gzip") != NULL) {
+            } else if (uri->meta->filename_comp_gz[0] != 0 && strcontains(accept_encoding, "gzip")) {
                ctx->file = fopen(uri->meta->filename_comp_gz, "rb");
                if (ctx->file == NULL) {
                    cache_mark_dirty(ctx->conf->cache, uri->filename);
@@ -135,80 +205,44 @@ static int local_handler(client_ctx_t *ctx) {
        }

        if (uri->meta->etag[0] != 0) {
+            strcpy(buf1, uri->meta->etag);
            if (enc) {
-                sprintf(buf1, "%s-%s", uri->meta->etag, (enc & COMPRESS_BR) ? "br" : (enc & COMPRESS_GZ) ? "gzip" : "");
-                http_add_header_field(&res->hdr, "ETag", buf1);
-            } else {
-                http_add_header_field(&res->hdr, "ETag", uri->meta->etag);
+                strcat(buf1, "-");
+                strcat(buf1, (enc & COMPRESS_BR) ? "br" : (enc & COMPRESS_GZ) ? "gzip" : "");
            }
+            http_add_header_field(&res->hdr, "ETag", buf1);
        }

-        if (strncmp(uri->meta->type, "text/", 5) == 0) {
-            http_add_header_field(&res->hdr, "Cache-Control", "public, max-age=3600");
-        } else {
-            http_add_header_field(&res->hdr, "Cache-Control", "public, max-age=86400");
-        }
+        http_add_header_field(&res->hdr, "Cache-Control", mime_is_text(uri->meta->type) ? "public, max-age=3600" : "public, max-age=86400");

        const char *if_modified_since = http_get_header_field(&req->hdr, "If-Modified-Since");
        const char *if_none_match = http_get_header_field(&req->hdr, "If-None-Match");
-        if ((if_none_match != NULL && strstr(if_none_match, uri->meta->etag) == NULL) ||
-            (accept_if_modified_since && if_modified_since != NULL && strcmp(if_modified_since, last_modified) == 0))
+        if ((if_none_match != NULL && !strcontains(if_none_match, uri->meta->etag)) ||
+            (accept_if_modified_since && streq(if_modified_since, last_modified)))
        {
            res->status = http_get_status(304);
            return 0;
        }

-        const char *range = http_get_header_field(&req->hdr, "Range");
-        if (range != NULL) {
-            if (strlen(range) <= 6 || strncmp(range, "bytes=", 6) != 0) {
-                res->status = http_get_status(416);
+        if (http_get_header_field(&req->hdr, "Range") != NULL) {
+            if (range_handler(ctx) == 0) {
+                res->status = http_get_status(206);
+            } else {
+                if (ctx->file) {
+                    fclose(ctx->file);
+                    ctx->file = NULL;
+                }
                http_remove_header_field(&res->hdr, "Content-Type", HTTP_REMOVE_ALL);
                http_remove_header_field(&res->hdr, "Last-Modified", HTTP_REMOVE_ALL);
                http_remove_header_field(&res->hdr, "ETag", HTTP_REMOVE_ALL);
                http_remove_header_field(&res->hdr, "Cache-Control", HTTP_REMOVE_ALL);
-                return 0;
-            }
-            range += 6;
-            char *ptr = strchr(range, '-');
-            if (ptr == NULL) {
                res->status = http_get_status(416);
-                return 0;
            }
-            ctx->file = fopen(uri->filename, "rb");
-            fseek(ctx->file, 0, SEEK_END);
-            unsigned long file_len = ftell(ctx->file);
-            fseek(ctx->file, 0, SEEK_SET);
-            if (file_len == 0) {
-                ctx->content_length = 0;
-                return 0;
-            }
-            long num1 = 0;
-            long num2 = (long) file_len - 1;
-
-            if (ptr != range) num1 = (long) strtoul(range, NULL, 10);
-            if (ptr[1] != 0) num2 = (long) strtoul(ptr + 1, NULL, 10);
-
-            if (num1 >= file_len || num2 >= file_len || num1 > num2) {
-                res->status = http_get_status(416);
-                return 0;
-            }
-            sprintf(buf1, "bytes %li-%li/%li", num1, num2, file_len);
-            http_add_header_field(&res->hdr, "Content-Range", buf1);
-
-            res->status = http_get_status(206);
-            fseek(ctx->file, num1, SEEK_SET);
-            ctx->content_length = num2 - num1 + 1;
-
            return 0;
        }

-        if (ctx->file == NULL) {
-            ctx->file = fopen(uri->filename, "rb");
-        }
-
-        fseek(ctx->file, 0, SEEK_END);
-        ctx->content_length = ftell(ctx->file);
-        fseek(ctx->file, 0, SEEK_SET);
+        if (ctx->file == NULL) ctx->file = fopen(uri->filename, "rb");
+        ctx->content_length = fsize(ctx->file);
    } else {
        return 1;
    }
--- a/src/worker/proxy_handler.c
+++ b/src/worker/proxy_handler.c
@@ -63,12 +63,12 @@ static int proxy_handler_1(client_ctx_t *ctx) {
        const char *connection = http_get_header_field(&res->hdr, "Connection");
        const char *upgrade = http_get_header_field(&res->hdr, "Upgrade");
        if (connection != NULL && upgrade != NULL &&
-            (strstr(connection, "upgrade") != NULL || strstr(connection, "Upgrade") != NULL) &&
-             strcmp(upgrade, "websocket") == 0)
+            (strcontains(connection, "upgrade") || strcontains(connection, "Upgrade")) &&
+            streq(upgrade, "websocket"))
        {
            const char *ws_accept = http_get_header_field(&res->hdr, "Sec-WebSocket-Accept");
            if (ws_calc_accept_key(status->ws_key, buf) == 0) {
-                ctx->use_proxy = (strcmp(buf, ws_accept) == 0) ? 2 : 1;
+                ctx->use_proxy = streq(buf, ws_accept) ? 2 : 1;
            }
        } else {
            status->status = 101;
@@ -84,10 +84,10 @@ static int proxy_handler_1(client_ctx_t *ctx) {
        const char *content_encoding = http_get_header_field(&res->hdr, "Content-Encoding");
        if (content_encoding == NULL && (
                content_length_f == NULL ||
-                (content_length_f != NULL && strcmp(content_length_f, "0") == 0) ||
-                (content_type != NULL && content_length_f != NULL && strncmp(content_type, "text/html", 9) == 0)))
+                streq(content_length_f, "0") ||
+                (content_length_f != NULL && strstarts(content_type, "text/html"))))
        {
-            long content_len = (strcmp(ctx->req.method, "HEAD") != 0 && content_length_f != NULL) ? strtol(content_length_f, NULL, 10) : 0;
+            long content_len = (!streq(ctx->req.method, "HEAD") && content_length_f != NULL) ? strtol(content_length_f, NULL, 10) : 0;
            if (content_len <= sizeof(ctx->msg_content) - 1) {
                if (status->status != 101) {
                    status->status = res->status->code;
@@ -103,7 +103,7 @@ static int proxy_handler_1(client_ctx_t *ctx) {
        }
    }

-    if (strcmp(ctx->req.method, "HEAD") == 0) {
+    if (streq(ctx->req.method, "HEAD")) {
        return 1;
    }

@@ -119,7 +119,7 @@ static int proxy_handler_1(client_ctx_t *ctx) {
    }

    char *transfer_encoding = http_get_header_field(&res->hdr, "Transfer-Encoding");
-    int chunked = transfer_encoding != NULL && strcmp(transfer_encoding, "chunked") == 0;
+    int chunked = transfer_encoding != NULL && streq(transfer_encoding, "chunked");
    http_remove_header_field(&res->hdr, "Transfer-Encoding", HTTP_REMOVE_ALL);
    ret = sprintf(buf, "%s%s%s",
                  (use_proxy & PROXY_COMPRESS_BR) ? "br" :
@@ -136,7 +136,7 @@ static int proxy_handler_1(client_ctx_t *ctx) {

 static int proxy_handler_2(client_ctx_t *ctx) {
    const char *transfer_encoding = http_get_header_field(&ctx->res.hdr, "Transfer-Encoding");
-    int chunked = transfer_encoding != NULL && strstr(transfer_encoding, "chunked") != NULL;
+    int chunked = strcontains(transfer_encoding, "chunked");

    const char *content_len = http_get_header_field(&ctx->res.hdr, "Content-Length");
    unsigned long len_to_send = 0;
--- a/src/worker/request_handler.c
+++ b/src/worker/request_handler.c
@@ -108,7 +108,7 @@ static int request_handler(client_ctx_t *ctx) {
    }

    const char *hdr_connection = http_get_header_field(&req->hdr, "Connection");
-    ctx->c_keep_alive = (hdr_connection != NULL && (strstr(hdr_connection, "keep-alive") != NULL || strstr(hdr_connection, "Keep-Alive") != NULL));
+    ctx->c_keep_alive = (strcontains(hdr_connection, "keep-alive") || strcontains(hdr_connection, "Keep-Alive"));
    const char *host_ptr = http_get_header_field(&req->hdr, "Host");
    if (host_ptr != NULL && strlen(host_ptr) > 255) {
        ctx->req_host[0] = 0;
@@ -131,8 +131,8 @@ static int request_handler(client_ctx_t *ctx) {
    logger_set_prefix("[%s%*s%s]%s", BLD_STR, INET6_ADDRSTRLEN, ctx->req_host, CLR_STR, ctx->log_prefix);
    info(BLD_STR "%s %s", req->method, req->uri);

-    if (strncmp(req->uri, "/.sesimos/res/", 14) == 0) {
-        if (strcmp(req->method, "GET") != 0 && strcmp(req->method, "HEAD") != 0) {
+    if (strstarts(req->uri, "/.sesimos/res/")) {
+        if (!streq(req->method, "GET") && !streq(req->method, "HEAD")) {
            res->status = http_get_status(405);
            http_add_header_field(&res->hdr, "Allow", "GET, HEAD");
            return 0;
@@ -150,7 +150,7 @@ static int request_handler(client_ctx_t *ctx) {
        res->status = http_get_status(404);
        for (int i = 0; i < sizeof(resources) / sizeof(res_t); i++) {
            const res_t *r = &resources[i];
-            if (strcmp(req->uri + 14, r->name) == 0) {
+            if (streq(req->uri + 14, r->name)) {
                res->status = http_get_status(203);
                http_add_header_field(&res->hdr, "Content-Type", r->type);
                http_add_header_field(&res->hdr, "Cache-Control", "public, max-age=86400");
@@ -189,13 +189,13 @@ static int request_handler(client_ctx_t *ctx) {
        return 0;
    }

-    if (ctx->conf->type == CONFIG_TYPE_LOCAL && strcmp(req->method, "TRACE") == 0) {
+    if (ctx->conf->type == CONFIG_TYPE_LOCAL && streq(req->method, "TRACE")) {
        return 1;
    } else if (dir_mode != URI_DIR_MODE_NO_VALIDATION) {
        ssize_t size = sizeof(buf0);
        url_decode(req->uri, buf0, &size);
-        int change_proto = (!client->enc && strncmp(uri->uri, "/.well-known/", 13) != 0);
-        if (strcmp(uri->uri, buf0) != 0 || change_proto) {
+        int change_proto = (!client->enc && !strstarts(uri->uri, "/.well-known/"));
+        if (!streq(uri->uri, buf0) || change_proto) {
            res->status = http_get_status(308);
            size = url_encode(uri->uri, strlen(uri->uri), buf0, sizeof(buf0));
            if (change_proto) {
@@ -271,7 +271,7 @@ int respond(client_ctx_t *ctx) {
                        snprintf(ctx->msg_content, sizeof(ctx->msg_content), "      <ul>\n        <li><a href=\"%s\">%s</a></li>\n      </ul>\n", location, location);
                    }
                }
-            } else if (strncmp(ctx->msg_content, "<!DOCTYPE html>", 15) == 0 || strncmp(ctx->msg_content, "<html", 5) == 0) {
+            } else if (strstarts(ctx->msg_content, "<!DOCTYPE html>") || strstarts(ctx->msg_content, "<html")) {
                ctx->msg_content[0] = 0;
                // TODO let relevant information pass?
            }
@@ -340,7 +340,7 @@ int respond(client_ctx_t *ctx) {
    if (ctx->use_proxy) {
        // reverse proxy
        return 3;
-    } else if (strcmp(req->method, "HEAD") != 0) {
+    } else if (!streq(req->method, "HEAD")) {
        // default response
        if (ctx->msg_buf != NULL) {
            ret = sock_send(client, ctx->msg_buf, ctx->content_length, 0);
--- a/src/worker/tcp_acceptor.c
+++ b/src/worker/tcp_acceptor.c
@@ -33,7 +33,7 @@ static int tcp_acceptor(client_ctx_t *ctx) {
    struct sockaddr_in6 server_addr;

    inet_ntop(ctx->socket._addr.ipv6.sin6_family, &ctx->socket._addr.ipv6.sin6_addr, ctx->_c_addr, sizeof(ctx->_c_addr));
-    if (strncmp(ctx->_c_addr, "::ffff:", 7) == 0) {
+    if (strstarts(ctx->_c_addr, "::ffff:")) {
        ctx->socket.addr = ctx->_c_addr + 7;
    } else {
        ctx->socket.addr = ctx->_c_addr;
@@ -42,7 +42,7 @@ static int tcp_acceptor(client_ctx_t *ctx) {
    socklen_t len = sizeof(server_addr);
    getsockname(ctx->socket.socket, (struct sockaddr *) &server_addr, &len);
    inet_ntop(server_addr.sin6_family, (void *) &server_addr.sin6_addr, ctx->_s_addr, sizeof(ctx->_s_addr));
-    if (strncmp(ctx->_s_addr, "::ffff:", 7) == 0) {
+    if (strstarts(ctx->_s_addr, "::ffff:")) {
        ctx->socket.s_addr = ctx->_s_addr + 7;
    } else {
        ctx->socket.s_addr = ctx->_s_addr;
@@ -105,7 +105,7 @@ static int tcp_acceptor(client_ctx_t *ctx) {
        if (ret != 1) {
            error_ssl(SSL_get_error(client->ssl, ret));
            info("Unable to perform handshake");
-            return - 1;
+            return -1;
        }
        client->ts_last = clock_micros();
    }
@@ -118,6 +118,7 @@ static int tcp_acceptor(client_ctx_t *ctx) {
 }

 void tcp_close(client_ctx_t *ctx) {
+    errno = 0;
    logger_set_prefix("[%*s]%s", INET6_ADDRSTRLEN, ctx->socket.s_addr, ctx->log_prefix);

    sock_close(&ctx->socket);
Author	SHA1	Message	Date
Lorenz Stechauner	581b4dc5aa	Fix flines()	2023-01-11 15:07:01 +01:00
Lorenz Stechauner	611ceabfb2	Small fixes in tcp_acceptor	2023-01-11 14:49:06 +01:00
Lorenz Stechauner	6b295cef95	Add Accept-Ranges lines	2023-01-11 14:30:12 +01:00
Lorenz Stechauner	764b754a6f	Add more utils	2023-01-11 11:06:36 +01:00
Lorenz Stechauner	7699583c5f	List/FastCGI cleanup	2023-01-11 00:34:17 +01:00
Lorenz Stechauner	8b92d4ff91	Remove color_table	2023-01-10 23:54:47 +01:00
Lorenz Stechauner	e8d8abdc5a	Add -C --clean	2023-01-10 23:52:29 +01:00
Lorenz Stechauner	15c6b7ddaa	Create .sesimos/ in cache_init	2023-01-09 22:53:42 +01:00
Lorenz Stechauner	e9a065f8aa	Add -pthread to Makefile	2023-01-09 22:47:50 +01:00
Lorenz Stechauner	0730429041	Fix error.c	2023-01-09 22:45:37 +01:00