iodine 0.7.54 → 0.7.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bf1dc45230e4d64130055f60291bddd92144bc7c2349a8b10a8829d32f3c09c
-  data.tar.gz: 858d92f6b21c05d6b38ee525822c986de2757e1a290f8164369012e60735b920
+  metadata.gz: e2f42cc055212f19560dc49734f4ab9b4e0be6382172d5b9e7eed59791b88381
+  data.tar.gz: 2addb1393f4689b6dd0ab826c43a7dc9b0942e42fdc1ced57b153a910ef6e621
 SHA512:
-  metadata.gz: ebaf17fafa2997d5b2d06df4fbc9c537558e5f6a2464b16da3af20908fc6f3875d772ad81da393cb8bcba713bb359fb8918266060a9d80ee5ec07f04957732dd
-  data.tar.gz: 7e87d6eaa475c5c39e0dfdb60ad8b45a3d095e7f8b702dacbdbc5acf8a7410caf86793415e482b8cb08b882ddc5678a90800697a8ce6a1c6cdece47cf7cecec1
+  metadata.gz: 26cad762bc6d533c7a1828550a371b7db6107fae7439d02176eb02b70bd8887c8a30f7b1c68b931b2088aee728c7e098bbdbf9eec1cefcac697d31ccaf8ebe09
+  data.tar.gz: 7582b83233ce7ef198cc9a1d561b738396b5fe6d0b1701ba3984ec164735b3d8ce3fe3973481772217f7d580ec8b070d0493550859abfe0cbe03a5b8c9b6a738

data/CHANGELOG.md

@@ -6,6 +6,14 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ## Changes:
 
+#### Change log v.0.7.56 (2023-07-07)
+
+**Support**: Adds teapot support (HTTP code 418). Credit to Aleksandar N. Kostadinov (@akostadinov) for issue #144 and PR #145.
+
+#### Change log v.0.7.55 (2023-05-01)
+
+**Fix**: Fixes `X-SENDFILE` support so it works will `POST` requests. Credit to @fgoepel for PR #141.
+
 #### Change log v.0.7.54 (2023-03-15)
 
 **Fix**: Fixes verbosity option in iodine's CLI where the value `0` was ignored. Credit to @jsaak for opening issue #139.

data/ext/iodine/http.c

@@ -565,6 +565,7 @@ found_file:
       http_finish(h);
       return 0;
     }
+    goto open_file;
     break;
   }
   http_send_error(h, 403);
@@ -2648,7 +2649,7 @@ static char invalid_cookie_value_char[256] = {
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
 
 // clang-format off
-#define HTTP_SET_STATUS_STR(status, str) [status-100] = { .data = (char *)(str), .len = (sizeof(str) - 1) }
+#define HTTP_SET_STATUS_STR(status, str) [status-100] = { .data = (char *)(#status " " str), .len = (sizeof( #status " " str) - 1) }
 // clang-format on
 
 /** Returns the status as a C string struct */
@@ -2695,6 +2696,7 @@ fio_str_info_s http_status2str(uintptr_t status) {
       HTTP_SET_STATUS_STR(415, "Unsupported Media Type"),
       HTTP_SET_STATUS_STR(416, "Range Not Satisfiable"),
       HTTP_SET_STATUS_STR(417, "Expectation Failed"),
+      HTTP_SET_STATUS_STR(418, "I'm a teapot"),
       HTTP_SET_STATUS_STR(421, "Misdirected Request"),
       HTTP_SET_STATUS_STR(422, "Unprocessable Entity"),
       HTTP_SET_STATUS_STR(423, "Locked"),

data/ext/iodine/http1.c

@@ -45,8 +45,6 @@ inline static void h1_reset(http1pr_s *p) { p->header_size = 0; }
 #define http1_pr2handle(pr) (((http1pr_s *)(pr))->request)
 #define handle2pr(h) ((http1pr_s *)h->private_data.flag)
 
-static fio_str_info_s http1pr_status2str(uintptr_t status);
-
 /* cleanup an HTTP/1.1 handler object */
 static inline void http1_after_finish(http_s *h) {
   http1pr_s *p = handle2pr(h);
@@ -112,8 +110,10 @@ static FIOBJ headers2str(http_s *h, uintptr_t padding) {
   http1pr_s *p = handle2pr(h);
 
   if (p->is_client == 0) {
-    fio_str_info_s t = http1pr_status2str(h->status);
+    fio_str_info_s t = http_status2str(h->status);
+    fiobj_str_write(w.dest, "HTTP/1.1 ", 9);
     fiobj_str_write(w.dest, t.data, t.len);
+    fiobj_str_write(w.dest, "\r\n", 2);
     FIOBJ tmp = fiobj_hash_get2(h->private_data.out_headers, connection_hash);
     if (tmp) {
       t = fiobj_obj2cstr(tmp);
@@ -823,90 +823,3 @@ void http1_destroy(fio_protocol_s *pr) {
   // *)p->p.uuid, (int)fio_uuid2fd(p->p.uuid), (void *)p);
   fio_free(p); // occasional Windows crash bug
 }
-
-/* *****************************************************************************
-Protocol Data
-***************************************************************************** */
-
-// clang-format off
-#define HTTP_SET_STATUS_STR(status, str) [((status)-100)] = { .data = (char*)("HTTP/1.1 " #status " " str "\r\n"), .len = (sizeof("HTTP/1.1 " #status " " str "\r\n") - 1) }
-// #undef HTTP_SET_STATUS_STR
-// clang-format on
-
-static fio_str_info_s http1pr_status2str(uintptr_t status) {
-  static fio_str_info_s status2str[] = {
-      HTTP_SET_STATUS_STR(100, "Continue"),
-      HTTP_SET_STATUS_STR(101, "Switching Protocols"),
-      HTTP_SET_STATUS_STR(102, "Processing"),
-      HTTP_SET_STATUS_STR(103, "Early Hints"),
-      HTTP_SET_STATUS_STR(200, "OK"),
-      HTTP_SET_STATUS_STR(201, "Created"),
-      HTTP_SET_STATUS_STR(202, "Accepted"),
-      HTTP_SET_STATUS_STR(203, "Non-Authoritative Information"),
-      HTTP_SET_STATUS_STR(204, "No Content"),
-      HTTP_SET_STATUS_STR(205, "Reset Content"),
-      HTTP_SET_STATUS_STR(206, "Partial Content"),
-      HTTP_SET_STATUS_STR(207, "Multi-Status"),
-      HTTP_SET_STATUS_STR(208, "Already Reported"),
-      HTTP_SET_STATUS_STR(226, "IM Used"),
-      HTTP_SET_STATUS_STR(300, "Multiple Choices"),
-      HTTP_SET_STATUS_STR(301, "Moved Permanently"),
-      HTTP_SET_STATUS_STR(302, "Found"),
-      HTTP_SET_STATUS_STR(303, "See Other"),
-      HTTP_SET_STATUS_STR(304, "Not Modified"),
-      HTTP_SET_STATUS_STR(305, "Use Proxy"),
-      HTTP_SET_STATUS_STR(306, "(Unused), "),
-      HTTP_SET_STATUS_STR(307, "Temporary Redirect"),
-      HTTP_SET_STATUS_STR(308, "Permanent Redirect"),
-      HTTP_SET_STATUS_STR(400, "Bad Request"),
-      HTTP_SET_STATUS_STR(403, "Forbidden"),
-      HTTP_SET_STATUS_STR(404, "Not Found"),
-      HTTP_SET_STATUS_STR(401, "Unauthorized"),
-      HTTP_SET_STATUS_STR(402, "Payment Required"),
-      HTTP_SET_STATUS_STR(405, "Method Not Allowed"),
-      HTTP_SET_STATUS_STR(406, "Not Acceptable"),
-      HTTP_SET_STATUS_STR(407, "Proxy Authentication Required"),
-      HTTP_SET_STATUS_STR(408, "Request Timeout"),
-      HTTP_SET_STATUS_STR(409, "Conflict"),
-      HTTP_SET_STATUS_STR(410, "Gone"),
-      HTTP_SET_STATUS_STR(411, "Length Required"),
-      HTTP_SET_STATUS_STR(412, "Precondition Failed"),
-      HTTP_SET_STATUS_STR(413, "Payload Too Large"),
-      HTTP_SET_STATUS_STR(414, "URI Too Long"),
-      HTTP_SET_STATUS_STR(415, "Unsupported Media Type"),
-      HTTP_SET_STATUS_STR(416, "Range Not Satisfiable"),
-      HTTP_SET_STATUS_STR(417, "Expectation Failed"),
-      HTTP_SET_STATUS_STR(421, "Misdirected Request"),
-      HTTP_SET_STATUS_STR(422, "Unprocessable Entity"),
-      HTTP_SET_STATUS_STR(423, "Locked"),
-      HTTP_SET_STATUS_STR(424, "Failed Dependency"),
-      HTTP_SET_STATUS_STR(425, "Unassigned"),
-      HTTP_SET_STATUS_STR(426, "Upgrade Required"),
-      HTTP_SET_STATUS_STR(427, "Unassigned"),
-      HTTP_SET_STATUS_STR(428, "Precondition Required"),
-      HTTP_SET_STATUS_STR(429, "Too Many Requests"),
-      HTTP_SET_STATUS_STR(430, "Unassigned"),
-      HTTP_SET_STATUS_STR(431, "Request Header Fields Too Large"),
-      HTTP_SET_STATUS_STR(500, "Internal Server Error"),
-      HTTP_SET_STATUS_STR(501, "Not Implemented"),
-      HTTP_SET_STATUS_STR(502, "Bad Gateway"),
-      HTTP_SET_STATUS_STR(503, "Service Unavailable"),
-      HTTP_SET_STATUS_STR(504, "Gateway Timeout"),
-      HTTP_SET_STATUS_STR(505, "HTTP Version Not Supported"),
-      HTTP_SET_STATUS_STR(506, "Variant Also Negotiates"),
-      HTTP_SET_STATUS_STR(507, "Insufficient Storage"),
-      HTTP_SET_STATUS_STR(508, "Loop Detected"),
-      HTTP_SET_STATUS_STR(509, "Unassigned"),
-      HTTP_SET_STATUS_STR(510, "Not Extended"),
-      HTTP_SET_STATUS_STR(511, "Network Authentication Required"),
-  };
-  fio_str_info_s ret = (fio_str_info_s){.len = 0, .data = NULL};
-  if (status >= 100 &&
-      (status - 100) < sizeof(status2str) / sizeof(status2str[0]))
-    ret = status2str[status - 100];
-  if (!ret.data) {
-    ret = status2str[400];
-  }
-  return ret;
-}
-#undef HTTP_SET_STATUS_STR

data/ext/iodine/http_internal.c

@@ -42,7 +42,8 @@ void http_on_request_handler______internal(http_s *h,
           fiobj_hash_get2(h->headers, fiobj_obj2hash(HTTP_HEADER_ACCEPT)),
           HTTP_HVALUE_SSE_MIME))
     goto eventsource;
-  if (settings->public_folder) {
+  if (settings->public_folder &&
+      (fiobj_obj2cstr(h->method).len != 4 || strncasecmp("post", fiobj_obj2cstr(h->method).data, 4))) {
     fio_str_info_s path_str = fiobj_obj2cstr(h->path);
     if (!http_sendfile2(h, settings->public_folder,
                         settings->public_folder_length, path_str.data,

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.7.54'.freeze
+  VERSION = '0.7.56'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.54
+  version: 0.7.56
 platform: ruby
 authors:
 - Boaz Segev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -246,7 +246,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
 post_install_message: |-
-  Thank you for installing Iodine 0.7.54.
+  Thank you for installing Iodine 0.7.56.
   Remember: if iodine supports your business, it's only fair to give value back (code contributions / donations).
 rdoc_options: []
 require_paths: