rage-iodine 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e0cf25032c21b2f527b8692bfead0da142cecc0bc625eea36da5a45046978ef
-  data.tar.gz: 512d45f660c336e8b33dd237fce1eec816828039a4139b71c505b318ecf37ef6
+  metadata.gz: 26936e113c659cee25877d312515e6fe50ca5ed56ff5e8195e6f5274292f2145
+  data.tar.gz: 40b7aa9c791a5bc08513e5e0c478c02274a39c81d9be0fab7736f8478157ffab
 SHA512:
-  metadata.gz: 82b018d7b9d1b7a3ce6facec12f22e27b1a3699a093571240ccaa95f98985cbf89a88a68821354eb5f5c3deb268f177c990afd2d396c6d776902dbafbcff96c9
-  data.tar.gz: 60a58204b498adc19204793c6366168732718393fa8d3cdd49788bc94ae2d6c2a972d912ed51a22b16e24e48850fe05d11cdfb6c5d0839340b7533719267cc3d
+  metadata.gz: 1a789b92abed8d78b010ace73cb41d1688ff50c4fc6b590b6705a717196c212721039e252461ba8834a8f0bcd43679fc9c611a9f4d4690a826f3ac212bb3b9e5
+  data.tar.gz: 446a4ecf05a3b371266ea71a92cb514d9a510d2c0fb6dc72e212ff26253e60c343bfc1675a68e6f3c9985c267b9940e61492706f4e61d89e6cb73dbba6c05a2c

data/CHANGELOG.md

@@ -6,6 +6,16 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ## Changes:
 
+#### Change log v.4.0.0 (2024-09-11)
+
+**Update**: Stop disconnecting from the DB on fork.
+
+**Update**: Fiber Scheduler updates to correctly close file descriptors.
+
+#### Change log v.3.3.0 (2024-08-18)
+
+**Update**: Improvements and fixes for the static file service.
+
 #### Change log v.3.2.0 (2024-07-15)
 
 **Update**: Explicitly undefine the alloc function on IodineObjectStorage.

data/ext/iodine/fio.c

@@ -363,6 +363,8 @@ typedef struct {
   uint8_t open;
   /** indicated that the connection should be closed. */
   uint8_t close;
+  /** indicates whether the fd is coming from the Fiber Scheduler. */
+  uint8_t internal;
   /** peer address length */
   uint8_t addr_len;
   /** peer address */
@@ -2075,7 +2077,7 @@ static size_t fio_poll(void) {
         epoll_wait(internal[j].data.fd, events, FIO_POLL_MAX_EVENTS, 0);
     if (active_count > 0) {
       for (int i = 0; i < active_count; i++) {
-        if (events[i].events & (~(EPOLLIN | EPOLLOUT | EPOLLHUP | EPOLLRDHUP))) {
+        if (events[i].events & (~(EPOLLIN | EPOLLOUT | EPOLLHUP | EPOLLRDHUP | EPOLLERR))) {
           // errors are hendled as disconnections (on_close)
           fio_force_close_in_poll(fd2uuid(events[i].data.fd));
         } else {
@@ -2088,9 +2090,12 @@ static size_t fio_poll(void) {
             fio_defer_push_task(deferred_on_data,
                                 (void *)fd2uuid(events[i].data.fd), NULL);
           }
-          if (events[i].events & (EPOLLHUP | EPOLLRDHUP)) {
-            fio_defer_push_task(deferred_force_close_in_poll,
-                                (void *)fd2uuid(events[i].data.fd), NULL);
+          if (events[i].events & (EPOLLHUP | EPOLLRDHUP | EPOLLERR)) {
+            if(fd_data(events[i].data.fd).internal) {
+              fio_force_close_in_poll(fd2uuid(events[i].data.fd));
+            } else {
+              fio_clear_fd((intptr_t)events[i].data.fd, 0);
+            }
           }
         }
       } // end for loop
@@ -2226,8 +2231,11 @@ static size_t fio_poll(void) {
                             NULL);
       }
       if (events[i].flags & (EV_EOF | EV_ERROR)) {
-        fio_defer_push_task(deferred_force_close_in_poll,
-                            (void *)fd2uuid(events[i].udata), NULL);
+        if(fd_data(events[i].udata).internal) {
+          fio_force_close_in_poll(fd2uuid(events[i].udata));
+        } else {
+          fio_clear_fd((intptr_t)events[i].udata, 0);
+        }
       }
     }
   } else if (active_count < 0) {
@@ -4033,6 +4041,7 @@ static int fio_attach__internal(void *uuid_, void *protocol_) {
   }
   fio_protocol_s *old_pr = uuid_data(uuid).protocol;
   uuid_data(uuid).open = 1;
+  uuid_data(uuid).internal = 1;
   uuid_data(uuid).protocol = protocol;
   touchfd(fio_uuid2fd(uuid));
   fio_unlock(&uuid_data(uuid).protocol_lock);
@@ -4093,6 +4102,7 @@ static int fio_watch__internal(void *uuid_, void *protocol_) {
 
   fio_protocol_s *old_pr = uuid_data(uuid).protocol;
   uuid_data(uuid).open = 1;
+  uuid_data(uuid).internal = 0;
   uuid_data(uuid).protocol = protocol;
   touchfd(fio_uuid2fd(uuid));
   fio_unlock(&uuid_data(uuid).protocol_lock);

data/ext/iodine/http.c

@@ -460,23 +460,16 @@ no_gzip_support:
       !(S_ISREG(file_data.st_mode) || S_ISLNK(file_data.st_mode)))
     return -1;
 found_file:
-  /* set last-modified */
-  {
-    FIOBJ tmp = fiobj_str_buf(32);
-    fiobj_str_resize(
-        tmp, http_time2str(fiobj_obj2cstr(tmp).data, file_data.st_mtime));
-    http_set_header(h, HTTP_HEADER_LAST_MODIFIED, tmp);
-  }
   /* set cache-control */
   http_set_header(h, HTTP_HEADER_CACHE_CONTROL, fiobj_dup(HTTP_HVALUE_MAX_AGE));
+  /* set last-modified */
+  FIOBJ last_modified_str = fiobj_str_buf(32);
+  fiobj_str_resize(
+      last_modified_str, http_time2str(fiobj_obj2cstr(last_modified_str).data, file_data.st_mtime));
+  http_set_header(h, HTTP_HEADER_LAST_MODIFIED, last_modified_str);
   /* set & test etag */
-  uint64_t etag = (uint64_t)file_data.st_size;
-  etag ^= (uint64_t)file_data.st_mtime;
-  etag = fiobj_hash_string(&etag, sizeof(uint64_t));
-  FIOBJ etag_str = fiobj_str_buf(32);
-  fiobj_str_resize(etag_str,
-                   fio_base64_encode(fiobj_obj2cstr(etag_str).data,
-                                     (void *)&etag, sizeof(uint64_t)));
+  FIOBJ etag_str = fiobj_str_buf(1);
+  fiobj_str_printf(etag_str, "%lx-%llx", file_data.st_mtime, file_data.st_size);
   /* set */
   http_set_header(h, HTTP_HEADER_ETAG, etag_str);
   /* test */
@@ -499,7 +492,7 @@ found_file:
     if (!ifrange_hash)
       ifrange_hash = fiobj_hash_string("if-range", 8);
     FIOBJ tmp = fiobj_hash_get2(h->headers, ifrange_hash);
-    if (tmp && fiobj_iseq(tmp, etag_str)) {
+    if (tmp && !(fiobj_iseq(tmp, etag_str) || fiobj_iseq(tmp, last_modified_str))) {
       fiobj_hash_delete2(h->headers, range_hash);
     } else {
       tmp = fiobj_hash_get2(h->headers, range_hash);
@@ -513,26 +506,30 @@ found_file:
         char *pos = range.data + 6;
         int64_t start_at = 0, end_at = 0;
         start_at = fio_atol(&pos);
-        if (start_at >= file_data.st_size)
-          goto open_file;
         if (start_at >= 0) {
           pos++;
           end_at = fio_atol(&pos);
-          if (end_at <= 0)
-            goto open_file;
         }
         /* we ignore multimple ranges, only responding with the first range. */
-        if (start_at < 0) {
-          if (0 - start_at < file_data.st_size) {
-            offset = file_data.st_size - start_at;
-            length = 0 - start_at;
-          }
-        } else if (end_at) {
+        if (end_at) {
+          /* "Range bytes=100-200": bytes between `start_at` and `end_at` are requested */
+          if (start_at < 0 || end_at <= start_at || end_at >= length)
+            goto invalid_range;
+
           offset = start_at;
           length = end_at - start_at + 1;
-          if (length + start_at > file_data.st_size || length <= 0)
-            length = length - start_at;
+        } else if (start_at < 0) {
+          /* "Range bytes=-100": the last `start_at` bytes are requested */
+          if (0 - start_at >= length)
+            goto invalid_range;
+
+          offset = file_data.st_size + start_at;
+          length = 0 - start_at;
         } else {
+          /* "Range bytes=100-": all bytes starting at `start_at` are requested */
+          if (start_at >= length)
+            goto invalid_range;
+
           offset = start_at;
           length = length - start_at;
         }
@@ -612,6 +609,14 @@ open_file:
   }
   http_sendfile(h, file, length, offset);
   return 0;
+invalid_range:
+  {
+    FIOBJ crange = fiobj_str_buf(1);
+    fiobj_str_printf(crange, "bytes */%lu", (unsigned long)file_data.st_size);
+    http_set_header(h, HTTP_HEADER_CONTENT_RANGE, crange);
+    http_send_error(h, 416);
+    return 0;
+  }
 }
 
 /**

data/ext/iodine/scheduler.c

@@ -15,7 +15,8 @@
 static ID call_id;
 static uint8_t ATTACH_ON_READ_READY_CALLBACK;
 static uint8_t ATTACH_ON_WRITE_READY_CALLBACK;
-static VALUE timeout_args[1];
+static VALUE e_timeout_args[1];
+static VALUE e_closed_args[1];
 
 /* *****************************************************************************
 Fiber Scheduler API
@@ -36,6 +37,10 @@ typedef struct {
 static void iodine_scheduler_task_close(intptr_t uuid, fio_protocol_s *fio_protocol) {
   scheduler_protocol_s *protocol = (scheduler_protocol_s *)fio_protocol;
 
+  if (!protocol->fulfilled) {
+    IodineCaller.call2(protocol->block, call_id, 1, e_closed_args);
+  }
+
   IodineStore.remove(protocol->block);
   fio_free(protocol);
 
@@ -57,7 +62,7 @@ static void iodine_scheduler_task_timeout(intptr_t uuid, fio_protocol_s *fio_pro
   scheduler_protocol_s *protocol = (scheduler_protocol_s *)fio_protocol;
 
   if (!protocol->fulfilled) {
-    IodineCaller.call2(protocol->block, call_id, 1, timeout_args);
+    IodineCaller.call2(protocol->block, call_id, 1, e_timeout_args);
     protocol->fulfilled = 1;
   }
 }
@@ -178,7 +183,8 @@ Scheduler initialization
 
 void iodine_scheduler_initialize(void) {
   call_id = rb_intern2("call", 4);
-  timeout_args[0] = UINT2NUM(ETIMEDOUT);
+  e_timeout_args[0] = INT2NUM(-ETIMEDOUT);
+  e_closed_args[0] = INT2NUM(-EIO);
 
   VALUE SchedulerModule = rb_define_module_under(IodineModule, "Scheduler");
 

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '3.2.0'.freeze
+  VERSION = '4.0.0'.freeze
 end

data/lib/iodine.rb

@@ -156,12 +156,6 @@ require 'rack/handler/iodine' unless defined? ::Iodine::Rack::IODINE_RACK_LOADED
 
 ### Automatic ActiveRecord and Sequel support for forking (preventing connection sharing)
 Iodine.on_state(:before_fork)  do
-  if defined?(ActiveRecord) && defined?(ActiveRecord::Base) && ActiveRecord::Base.respond_to?(:connection)
-    begin
-      ActiveRecord::Base.connection.disconnect!
-    rescue
-    end
-  end
   if defined?(Sequel)
     begin
       Sequel::DATABASES.each { |database| database.disconnect }
@@ -169,14 +163,6 @@ Iodine.on_state(:before_fork)  do
     end
   end
 end
-Iodine.on_state(:after_fork)  do
-  if defined?(ActiveRecord) && defined?(ActiveRecord::Base) && ActiveRecord::Base.respond_to?(:establish_connection)
-    begin
-      ActiveRecord::Base.establish_connection
-    rescue
-    end
-  end
-end
 
 ### Parse CLI for default HTTP settings
 Iodine::Base::CLI.parse if defined?(IODINE_PARSE_CLI) && IODINE_PARSE_CLI

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rage-iodine
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Boaz Segev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -274,7 +274,7 @@ requirements:
 - Ruby >= 2.5.0 recommended.
 - TLS requires OpenSSL >= 1.1.0.
 - Or Windows with Ruby >= 3.0.0 build with MingW and MingW as compiler.
-rubygems_version: 3.5.9
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: iodine - a fast HTTP / Websocket Server with Pub/Sub support, optimized for