Fixed if indents

src/cache.c

@@ -77,9 +77,7 @@ int cache_process() {
                 fprintf(stdout, "[cache] Hashing file %s\n", cache[i].filename);
                 SHA1_Init(&ctx);
                 file = fopen(cache[i].filename, "rb");
-                compress = strncmp(cache[i].meta.type, "text/", 5) == 0 ||
-                        (strncmp(cache[i].meta.type, "application/", 12) == 0 &&
-                        strstr(cache[i].meta.type, "+xml") != NULL);
+                compress = mime_is_compressible(cache[i].meta.type);
 
                 int level = NECRONDA_ZLIB_LEVEL;
                 z_stream strm;
@@ -288,7 +286,7 @@ int cache_filename_comp_invalid(const char *filename) {
     int i;
     for (i = 0; i < FILE_CACHE_SIZE; i++) {
         if (cache[i].filename[0] != 0 && strlen(cache[i].filename) == strlen(filename) &&
-            strcmp(cache[i].filename, filename) == 0) {
+                strcmp(cache[i].filename, filename) == 0) {
             if (cache[i].is_updating) {
                 return 0;
             } else {
@@ -314,7 +312,7 @@ int uri_cache_init(http_uri *uri) {
     int i;
     for (i = 0; i < FILE_CACHE_SIZE; i++) {
         if (cache[i].filename[0] != 0 && strlen(cache[i].filename) == strlen(uri->filename) &&
-            strcmp(cache[i].filename, uri->filename) == 0) {
+                strcmp(cache[i].filename, uri->filename) == 0) {
             uri->meta = &cache[i].meta;
             if (cache[i].is_updating) {
                 return 0;

src/client.c

@@ -174,6 +174,12 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
         goto respond;
     }
 
+    if (http_get_header_field(&req.hdr, "Transfer-Encoding") != NULL) {
+        sprintf(err_msg, "This server is unable to process requests with the Transfer-Encoding header field.");
+        res.status = http_get_status(501);
+        goto respond;
+    }
+
     if (conf->type == CONFIG_TYPE_LOCAL) {
         if (strcmp(req.method, "TRACE") == 0) {
             res.status = http_get_status(200);
@@ -218,6 +224,12 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
                 goto respond;
             }
 
+            if (http_get_header_field(&req.hdr, "Content-Length") != NULL) {
+                res.status = http_get_status(400);
+                sprintf(err_msg, "A GET request must not contain a payload");
+                goto respond;
+            }
+
             ret = uri_cache_init(&uri);
             if (ret != 0) {
                 res.status = http_get_status(500);
@@ -240,8 +252,8 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
             char *if_modified_since = http_get_header_field(&req.hdr, "If-Modified-Since");
             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)) {
+                    (accept_if_modified_since && if_modified_since != NULL &&
+                    strcmp(if_modified_since, last_modified) == 0)) {
                 res.status = http_get_status(304);
                 goto respond;
             }
@@ -292,7 +304,7 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
 
             char *accept_encoding = http_get_header_field(&req.hdr, "Accept-Encoding");
             if (uri.meta->filename_comp[0] != 0 && accept_encoding != NULL &&
-                strstr(accept_encoding, "deflate") != NULL) {
+                    strstr(accept_encoding, "deflate") != NULL) {
                 file = fopen(uri.meta->filename_comp, "rb");
                 if (file == NULL) {
                     cache_filename_comp_invalid(uri.filename);
@@ -319,13 +331,9 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
                 goto respond;
             }
 
-            if (strcmp(req.method, "POST") == 0 || strcmp(req.method, "PUT") == 0) {
-                char *client_content_length = http_get_header_field(&req.hdr, "Content-Length");
-                unsigned long client_content_len;
-                if (client_content_length == NULL) {
-                    goto fastcgi_end;
-                }
-                client_content_len = strtoul(client_content_length, NULL, 10);
+            char *client_content_length = http_get_header_field(&req.hdr, "Content-Length");
+            if (client_content_length != NULL) {
+                unsigned long client_content_len = strtoul(client_content_length, NULL, 10);
                 ret = fastcgi_receive(&php_fpm, client, client_content_len);
                 if (ret != 0) {
                     if (ret < 0) {
@@ -337,7 +345,6 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
                     goto respond;
                 }
             }
-            fastcgi_end:
             fastcgi_close_stdin(&php_fpm);
 
             ret = fastcgi_header(&php_fpm, &res, err_msg);
@@ -364,13 +371,18 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
                 }
             }
 
-            char *accept_encoding = http_get_header_field(&req.hdr, "Accept-Encoding");
-            if (accept_encoding != NULL && strstr(accept_encoding, "deflate") != NULL) {
-                http_add_header_field(&res.hdr, "Content-Encoding", "deflate");
-            }
-
             content_length = -1;
             use_fastcgi = 1;
+
+            char *accept_encoding = http_get_header_field(&req.hdr, "Accept-Encoding");
+            char *content_type = http_get_header_field(&res.hdr, "Content-Type");
+            char *content_encoding = http_get_header_field(&res.hdr, "Content-Encoding");
+            if (mime_is_compressible(content_type) && content_encoding == NULL &&
+                    accept_encoding != NULL && strstr(accept_encoding, "deflate") != NULL) {
+                http_add_header_field(&res.hdr, "Content-Encoding", "deflate");
+                use_fastcgi = 2;
+            }
+
             if (http_get_header_field(&res.hdr, "Content-Length") == NULL) {
                 http_add_header_field(&res.hdr, "Transfer-Encoding", "chunked");
             }
@@ -395,7 +407,7 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
             http_add_header_field(&res.hdr, "Accept-Ranges", "none");
         }
         if (!use_fastcgi && !use_rev_proxy && file == NULL &&
-            ((res.status->code >= 400 && res.status->code < 600) || err_msg[0] != 0)) {
+                ((res.status->code >= 400 && res.status->code < 600) || err_msg[0] != 0)) {
             http_remove_header_field(&res.hdr, "Date", HTTP_REMOVE_ALL);
             http_remove_header_field(&res.hdr, "Server", HTTP_REMOVE_ALL);
             http_add_header_field(&res.hdr, "Date", http_get_date(buf0, sizeof(buf0)));
@@ -466,9 +478,7 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
         } else if (use_fastcgi) {
             char *transfer_encoding = http_get_header_field(&res.hdr, "Transfer-Encoding");
             int chunked = transfer_encoding != NULL && strcmp(transfer_encoding, "chunked") == 0;
-            char *content_encoding = http_get_header_field(&res.hdr, "Content-Encoding");
-            int comp = content_encoding != NULL && strcmp(content_encoding, "deflate") == 0;
-            int flags = (chunked ? FASTCGI_CHUNKED : 0) | (comp ? FASTCGI_COMPRESS : 0);
+            int flags = (chunked ? FASTCGI_CHUNKED : 0) | ((use_fastcgi == 2) ? FASTCGI_COMPRESS : 0);
             fastcgi_send(&php_fpm, client, flags);
         } else if (use_rev_proxy) {
             char *transfer_encoding = http_get_header_field(&res.hdr, "Transfer-Encoding");

src/utils.c

@@ -33,8 +33,8 @@ int url_encode_component(const char *str, char *enc, ssize_t *size) {
         }
         ch = str[i];
         if (ch == ':' || ch == '/' || ch == '?' || ch == '#' || ch == '[' || ch == ']' || ch == '@' || ch == '!' ||
-            ch == '$' || ch == '&' || ch == '\'' || ch == '(' || ch == ')' || ch == '*' || ch == '+' || ch == ',' ||
-            ch == ';' || ch == '=' || ch < ' ' || ch > '~') {
+                ch == '$' || ch == '&' || ch == '\'' || ch == '(' || ch == ')' || ch == '*' || ch == '+' || ch == ',' ||
+                ch == ';' || ch == '=' || ch < ' ' || ch > '~') {
             if ((ptr - enc + 2) >= *size) {
                 return -1;
             }
@@ -159,3 +159,17 @@ MMDB_entry_data_list_s *mmdb_json(MMDB_entry_data_list_s *list, char *str, long
     }
     return next;
 }
+
+int mime_is_compressible(const char *type) {
+    return
+        strncmp(type, "text/", 5) == 0 ||
+        strncmp(type, "message/", 7) == 0 ||
+        strstr(type, "+xml") != NULL ||
+        strcmp(type, "application/javascript") == 0 ||
+        strcmp(type, "application/json") == 0 ||
+        strcmp(type, "application/xml") == 0 ||
+        strcmp(type, "application/x-www-form-urlencoded") == 0 ||
+        strcmp(type, "application/x-tex") == 0 ||
+        strcmp(type, "application/x-httpd-php") == 0 ||
+        strcmp(type, "application/x-latex") == 0;
+}

src/utils.h

@@ -28,4 +28,6 @@ int url_encode(const char *str, char *enc, ssize_t *size);
 
 int url_decode(const char *str, char *dec, ssize_t *size);
 
+int mime_is_text(const char *type);
+
 #endif //NECRONDA_SERVER_UTILS_H