curb 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 363701a514e690ec0d3daab68555267a6640caa7242583941b674b2712eac9e4
-  data.tar.gz: 9cc165c1079d65dbff540ccdf10b4e456da09d21b81da52ecc9038b414e2c906
+  metadata.gz: 91423579fc22ce296ae84abfa27438de27d2e9bf6da58658ce86939aabecfe86
+  data.tar.gz: 46f1a051e546934eee05283bdbed84635ae1be3f46adaf48625140f260feb27f
 SHA512:
-  metadata.gz: 04cd7fece28ee5166ccf853d73686ff083b8ffac74c225f09f7795a39db27753a523736cfe604ad9880816f750774ba7f03f2ac0b2771276e8a3cefb75c60cf1
-  data.tar.gz: 7cf816b75ca9cafdd36bd9a7138735f19d609b9d2287066aff29f541f9581c5c10dcd70ac915a962e001d745ee5e8b7f37b2328819ac455f680f835225b64a75
+  metadata.gz: b863797088f6ade8e6a48c3018a7f24b4469fda0daa35cabdacc826452b31c028ba75a2d0fd9bfefeb90817a39421110979d7013b0a573c7b06016f27e7d93fd
+  data.tar.gz: 851be0f60e8e7e53db42f2e6b03742c403c55c7d2242282dd4bab8b77f33c4b0eb206fb221c7f26d26dafa2f6fdddd7a0e84369ca94a0afd038510910cf7d5de

data/ext/curb.h

@@ -28,11 +28,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "1.3.3"
-#define CURB_VER_NUM   1033
+#define CURB_VERSION   "1.3.4"
+#define CURB_VER_NUM   1034
 #define CURB_VER_MAJ   1
 #define CURB_VER_MIN   3
-#define CURB_VER_MIC   3
+#define CURB_VER_MIC   4
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_multi.c

@@ -1225,18 +1225,32 @@ static void rb_fdset_from_sockmap(st_table *map, rb_fdset_t *rfds, rb_fdset_t *w
   *maxfd_out = a.maxfd;
 }
 
-struct dispatch_args { CURLM *mh; int *running; CURLMcode mrc; rb_fdset_t *r; rb_fdset_t *w; rb_fdset_t *e; };
-static int dispatch_ready_fd_i(st_data_t key, st_data_t val, st_data_t argp) {
+struct ready_fd {
+  int fd;
+  int flags;
+};
+
+struct collect_ready_fd_args {
+  rb_fdset_t *r;
+  rb_fdset_t *w;
+  rb_fdset_t *e;
+  struct ready_fd *fds;
+  int capacity;
+  int count;
+};
+
+static int collect_ready_fd_i(st_data_t key, st_data_t val, st_data_t argp) {
   (void)val;
-  struct dispatch_args *dp = (struct dispatch_args *)argp;
+  struct collect_ready_fd_args *a = (struct collect_ready_fd_args *)argp;
   int fd = (int)key;
   int flags = 0;
-  if (rb_fd_isset(fd, dp->r)) flags |= CURL_CSELECT_IN;
-  if (rb_fd_isset(fd, dp->w)) flags |= CURL_CSELECT_OUT;
-  if (rb_fd_isset(fd, dp->e)) flags |= CURL_CSELECT_ERR;
-  if (flags) {
-    dp->mrc = curl_multi_socket_action(dp->mh, (curl_socket_t)fd, flags, dp->running);
-    if (dp->mrc != CURLM_OK) return ST_STOP;
+  if (rb_fd_isset(fd, a->r)) flags |= CURL_CSELECT_IN;
+  if (rb_fd_isset(fd, a->w)) flags |= CURL_CSELECT_OUT;
+  if (rb_fd_isset(fd, a->e)) flags |= CURL_CSELECT_ERR;
+  if (flags && a->count < a->capacity) {
+    a->fds[a->count].fd = fd;
+    a->fds[a->count].flags = flags;
+    a->count++;
   }
   return ST_CONTINUE;
 }
@@ -1336,12 +1350,25 @@ static void rb_curl_multi_socket_drive(VALUE self, ruby_curl_multi *rbcm, multi_
       any_ready = (rc > 0);
       did_timeout = (rc == 0);
       if (any_ready) {
-        struct dispatch_args d; d.mh = rbcm->handle; d.running = &rbcm->running; d.mrc = CURLM_OK; d.r = &rfds; d.w = &wfds; d.e = &efds;
-        st_foreach(ctx->sock_map, dispatch_ready_fd_i, (st_data_t)&d);
-        if (d.mrc != CURLM_OK) {
-          rb_fd_term(&rfds); rb_fd_term(&wfds); rb_fd_term(&efds);
-          raise_curl_multi_error_exception(d.mrc);
+        struct ready_fd *ready_fds = ALLOC_N(struct ready_fd, count_tracked);
+        struct collect_ready_fd_args d;
+        int i;
+        d.r = &rfds;
+        d.w = &wfds;
+        d.e = &efds;
+        d.fds = ready_fds;
+        d.capacity = count_tracked;
+        d.count = 0;
+        st_foreach(ctx->sock_map, collect_ready_fd_i, (st_data_t)&d);
+        for (i = 0; i < d.count; i++) {
+          mrc = curl_multi_socket_action(rbcm->handle, (curl_socket_t)d.fds[i].fd, d.fds[i].flags, &rbcm->running);
+          if (mrc != CURLM_OK) {
+            xfree(ready_fds);
+            rb_fd_term(&rfds); rb_fd_term(&wfds); rb_fd_term(&efds);
+            raise_curl_multi_error_exception(mrc);
+          }
         }
+        xfree(ready_fds);
       }
       rb_fd_term(&rfds); rb_fd_term(&wfds); rb_fd_term(&efds);
       handled_wait = 1;
@@ -1503,6 +1530,10 @@ static VALUE ruby_curl_multi_socket_drive_ensure(VALUE argp) {
     c->ctx->sock_map = NULL;
   }
   if (c->ctx) {
+    if (!NIL_P(c->ctx->io_cache)) {
+      rb_hash_clear(c->ctx->io_cache);
+      rb_gc_unregister_address(&c->ctx->io_cache);
+    }
     c->ctx->io_cache = Qnil;
   }
   return Qnil;
@@ -1523,6 +1554,7 @@ static VALUE ruby_curl_multi_socket_perform_impl(int argc, VALUE *argv, VALUE se
   ctx.sock_map = st_init_numtable();
   ctx.timeout_ms = -1;
   ctx.io_cache = rb_hash_new();
+  rb_gc_register_address(&ctx.io_cache);
 
   /* install socket/timer callbacks */
   curl_multi_setopt(rbcm->handle, CURLMOPT_SOCKETFUNCTION, multi_socket_cb);

data/tests/tc_fiber_scheduler.rb

@@ -66,7 +66,7 @@ class TestCurbFiberScheduler < Test::Unit::TestCase
   SERIAL_TIME_WOULD_BE_ABOUT = MIN_S * ITERS
 
   def setup
-    @port = 9993
+    @port = unused_local_port
 
     @response_proc = lambda do |res|
       res['Content-Type'] = 'text/plain'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Ross Bamford
 - Todd A. Fisher
 bindir: bin
 cert_chain: []
-date: 2026-05-11 00:00:00.000000000 Z
+date: 2026-05-12 00:00:00.000000000 Z
 dependencies: []
 description: Curb (probably CUrl-RuBy or something) provides Ruby-language bindings
   for the libcurl(3), a fully-featured client-side URL transfer library. cURL and