trilogy 2.12.4 → 2.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f4205f6f8754fd3b29bbf4d5ae3330e15b719565bbc9ab46039946cba683c1b
-  data.tar.gz: 65a8b6472442d8568b195fd45a61c0c337ef8507fa6528ebc1babf4e15ada1df
+  metadata.gz: d7bf5494671a9331547a73c7513cfe587b1a9300fe4bb96f70fd0957484c1ef4
+  data.tar.gz: e5f8c4c57b5c6cddfe3e574e3727d662b056211885456520854b69a6213708b6
 SHA512:
-  metadata.gz: 3fd1f19a93dd462a532cf0d2afcea6ac9b0949da83bc51569c5de9f5eb31c681e4214c16caa8e5779a3a7d14996fd3f3bbdc363bde875899458584d84420fecc
-  data.tar.gz: 17a7c0129f4cf5acfcc7f2b85ca305506f87548660ad2419f973ca45f1bbd81b45f52df9255b628f4914ec7a749570329941b3d7fbb83546509780cca1843aba
+  metadata.gz: 9ff46c61895e2a829c52faeb8d01d40c19f87106e121d3f92c344e8c66249ecc27de44fb43ab689dfc84f0d86e4508701c2b753be765852aebad8566a5d9daaf
+  data.tar.gz: 573a75c06969df47df0a0c73b8888919aebbdec81004644bd47ad5cfab579f9a967fecfbce782188aeb81e2fc7ad63167b1f0f150eb0e8dfc252f3039f99631c

data/ext/trilogy-ruby/cext.c

@@ -431,6 +431,8 @@ static int _cb_ruby_wait(trilogy_sock_t *sock, trilogy_wait_t wait)
     int state = 0;
     rb_protect(rb_trilogy_wait_protected, (VALUE)&args, &state);
     if (state) {
+        struct trilogy_ctx *ctx = sock->opts.privdata;
+        rb_trilogy_release_buffer(ctx);
         trilogy_sock_shutdown(sock);
         rb_jump_tag(state);
     }
@@ -467,6 +469,17 @@ escape the GVL on each wait operation without going through call_without_gvl */
         return TRILOGY_ERR;
     }
 
+    int flags = fcntl(fd, F_GETFD); /* should not fail except EBADF. */
+    if (flags == -1) {
+        close(newfd);
+        return TRILOGY_ERR;
+    }
+
+    if (fcntl(newfd, F_SETFD, flags) != 0){
+        close(newfd);
+        return TRILOGY_ERR;
+    }
+
     rc = trilogy_connect_set_fd(&ctx->conn, sock, newfd);
     if (rc < 0) {
         trilogy_sock_close(sock);
@@ -597,7 +610,9 @@ static int rb_io_descriptor(VALUE io)
 static VALUE rb_trilogy_connect(VALUE self, VALUE raw_socket, VALUE encoding, VALUE charset, VALUE opts)
 {
     struct trilogy_ctx *ctx = get_ctx(self);
-    trilogy_sockopt_t connopt = {0};
+    trilogy_sockopt_t connopt = {
+        .privdata = ctx,
+    };
     trilogy_handshake_t handshake;
     VALUE val;
 
@@ -1054,6 +1069,7 @@ static VALUE execute_read_query_response(struct trilogy_ctx *ctx)
 
     // If we have seen an unexpected exception, jump to it so it gets raised.
     if (state) {
+        rb_trilogy_release_buffer(ctx);
         trilogy_sock_shutdown(ctx->conn.socket);
         rb_jump_tag(state);
     }

data/ext/trilogy-ruby/inc/trilogy/socket.h

@@ -72,6 +72,8 @@ typedef struct {
     TRILOGY_CAPABILITIES_t flags;
 
     size_t max_allowed_packet;
+
+    void *privdata;
 } trilogy_sockopt_t;
 
 typedef struct trilogy_sock_t {

data/lib/trilogy/version.rb

@@ -1,3 +1,3 @@
 class Trilogy
-  VERSION = "2.12.4"
+  VERSION = "2.12.6"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: trilogy
 version: !ruby/object:Gem::Version
-  version: 2.12.4
+  version: 2.12.6
 platform: ruby
 authors:
 - GitHub Engineering
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -24,7 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email: opensource+trilogy@github.com
 executables: []
 extensions:
@@ -75,7 +73,6 @@ homepage: https://github.com/trilogy-libraries/trilogy
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,8 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.12
 specification_version: 4
 summary: A friendly MySQL-compatible library for Ruby, binding to libtrilogy
 test_files: []