ds9 1.3.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 675cfb91dad1dd9337150425144870db64e880c9
-  data.tar.gz: 31fa19e3c643ce1a425cb7c97b2fa6e145fb69d4
+SHA256:
+  metadata.gz: e8b2fb157e8388f8d381c77c4676c9d179217648a1712a96e036eebfe1fdd17d
+  data.tar.gz: 73283b1afcac1e5703a1d121c0dbe76c17b965b950eae9207ec0d62cf03bcecb
 SHA512:
-  metadata.gz: 5023590043ecd16dc8f9f004cb7c38e0b479806459c0716e108ba15160f3eb88d8d15fa0349118817aa7414d7878ece680c8dc97059bc102dfb2e13b2fa3b187
-  data.tar.gz: ed434905dc9b8129f0c812cec3a752b77618a61c157698e46c2d2b3b22221ac1a28145a089d222e31f37258e42221b5cdd9b841589a266e26a12e813e1f12b80
+  metadata.gz: 8df87ef9a3b64d895c28f73c102cf4269ef5018b338e873d1f990142deaeca2ec94f6a429610f9ba45d2f3c86807c5009290abe79ee88e46adc77dd8ff86fbbb
+  data.tar.gz: ab524840e37027405339a7e9a64c58503322b82ce56893237abe818507229ad3930adaabfbc4cf29e4ab57238f98bb6cf3a0dfb24a32893b588d4bcac77bac86

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake test

data/Gemfile

@@ -1 +1,3 @@
+source 'https://rubygems.org'
+
 gemspec

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 require "rake/extensiontask"
+require "rake/testtask"
 
 task default: :compile
 
@@ -9,4 +10,9 @@ Rake::ExtensionTask.new("ds9") do |t|
   t.lib_dir = "lib"
 end
 
+Rake::TestTask.new('test' => 'compile') do |t|
+  t.libs << 'test'
+  t.verbose = true
+end
+
 # vim: syntax=ruby

data/ext/ds9/ds9.c

@@ -23,7 +23,8 @@ ID id_on_header,
    id_on_stream_close,
    id_on_data_chunk_recv,
    id_on_data_source_read,
-   id_before_frame_send;
+   id_before_frame_send,
+   id_eof_p;
 
 #define CheckSelf(ptr) \
     if (NULL == (ptr)) \
@@ -157,7 +158,7 @@ static ssize_t recv_callback(nghttp2_session *session, uint8_t *buf,
     VALUE ret;
     ssize_t len;
 
-    ret = rb_funcall(self, id_recv_event, 1, INT2NUM(length));
+    ret = rb_funcall(self, id_recv_event, 1, ULONG2NUM(length));
 
     if (FIXNUM_P(ret)) {
 	return NUM2INT(ret);
@@ -270,7 +271,7 @@ static ssize_t rb_data_read_callback(nghttp2_session *session,
     ssize_t len;
 
     ret = rb_funcall(self, id_on_data_source_read, 2, INT2NUM(stream_id),
-	    INT2NUM(length));
+	    ULONG2NUM(length));
 
     if (NIL_P(ret)) {
 	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
@@ -320,8 +321,9 @@ struct hash_copy_ctx {
 };
 
 static int
-hash_copy_i(VALUE name, VALUE value, struct hash_copy_ctx * ctx)
+hash_copy_i(VALUE name, VALUE value, VALUE arg)
 {
+    struct hash_copy_ctx *ctx = (struct hash_copy_ctx *)arg;
     nghttp2_nv * head = ctx->head;
 
     head->name = (uint8_t *)StringValuePtr(name);
@@ -341,7 +343,7 @@ static void copy_hash_to_nv(VALUE hash, nghttp2_nv * head, size_t niv)
     struct hash_copy_ctx copy_ctx;
     copy_ctx.head = head;
 
-    rb_hash_foreach(hash, hash_copy_i, &copy_ctx);
+    rb_hash_foreach(hash, hash_copy_i, (VALUE)&copy_ctx);
 }
 
 static VALUE allocate_session(VALUE klass)
@@ -349,10 +351,11 @@ static VALUE allocate_session(VALUE klass)
     return TypedData_Wrap_Struct(klass, &ds9_session_type, 0);
 }
 
-static VALUE client_init_internals(VALUE self, VALUE cb)
+static VALUE client_init_internals(VALUE self, VALUE cb, VALUE opt)
 {
     nghttp2_session_callbacks *callbacks;
     nghttp2_session *session;
+    nghttp2_option *option;
     nghttp2_mem mem = {
 	NULL,
 	wrap_xmalloc,
@@ -362,17 +365,18 @@ static VALUE client_init_internals(VALUE self, VALUE cb)
     };
 
     TypedData_Get_Struct(cb, nghttp2_session_callbacks, &ds9_callbacks_type, callbacks);
-
-    nghttp2_session_client_new3(&session, callbacks, (void *)self, NULL, &mem);
+    option = UnwrapDS9Option(opt);
+    nghttp2_session_client_new3(&session, callbacks, (void *)self, option, &mem);
     DATA_PTR(self) = session;
 
     return self;
 }
 
-static VALUE server_init_internals(VALUE self, VALUE cb)
+static VALUE server_init_internals(VALUE self, VALUE cb, VALUE opt)
 {
     nghttp2_session_callbacks *callbacks;
     nghttp2_session *session;
+    nghttp2_option *option;
     nghttp2_mem mem = {
 	NULL,
 	wrap_xmalloc,
@@ -382,8 +386,8 @@ static VALUE server_init_internals(VALUE self, VALUE cb)
     };
 
     TypedData_Get_Struct(cb, nghttp2_session_callbacks, &ds9_callbacks_type, callbacks);
-
-    nghttp2_session_server_new3(&session, callbacks, (void *)self, NULL, &mem);
+    option = UnwrapDS9Option(opt);
+    nghttp2_session_server_new3(&session, callbacks, (void *)self, option, &mem);
     DATA_PTR(self) = session;
 
     return self;
@@ -487,6 +491,7 @@ static VALUE session_submit_trailer(VALUE self, VALUE stream_id, VALUE trailers)
 	    break;
 	default:
 	    Check_Type(trailers, T_ARRAY);
+	    UNREACHABLE;
     }
 
     nva = xcalloc(niv, sizeof(nghttp2_nv));
@@ -538,7 +543,7 @@ static VALUE session_receive(VALUE self)
 
 static VALUE session_mem_receive(VALUE self, VALUE buf)
 {
-    int rv;
+    ssize_t rv;
     nghttp2_session *session;
 
     TypedData_Get_Struct(self, nghttp2_session, &ds9_session_type, session);
@@ -546,10 +551,10 @@ static VALUE session_mem_receive(VALUE self, VALUE buf)
 
     rv = nghttp2_session_mem_recv(session, (const uint8_t *)StringValuePtr(buf), RSTRING_LEN(buf));
     if (rv < 0) {
-	explode(rv);
+	explode((int)rv);
     }
 
-    return INT2NUM(rv);
+    return ULONG2NUM(rv);
 }
 
 static VALUE session_mem_send(VALUE self)
@@ -568,7 +573,7 @@ static VALUE session_mem_send(VALUE self)
     }
 
     if (rv < 0) {
-	explode(rv);
+	explode((int)rv);
     }
 
     return rb_str_new((const char *)data, rv);
@@ -581,27 +586,33 @@ static VALUE session_outbound_queue_size(VALUE self)
     TypedData_Get_Struct(self, nghttp2_session, &ds9_session_type, session);
     CheckSelf(session);
 
-    return INT2NUM(nghttp2_session_get_outbound_queue_size(session));
+    return ULONG2NUM(nghttp2_session_get_outbound_queue_size(session));
 }
 
 static ssize_t
 ruby_read(nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t length,
     uint32_t *data_flags, nghttp2_data_source *source, void *user_data)
 {
-    VALUE ret = rb_funcall(source->ptr, rb_intern("read"), 1, INT2NUM(length));
+    VALUE body = (VALUE)source->ptr;
+    VALUE ret = rb_funcall(body, rb_intern("read"), 1, ULONG2NUM(length));
 
-    if (NIL_P(ret)) {
-	VALUE self = (VALUE)user_data;
-	rb_funcall(self, rb_intern("remove_post_buffer"), 1, INT2NUM(stream_id));
-	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
-	return 0;
-    } else if (FIXNUM_P(ret)) {
+    if (FIXNUM_P(ret)) {
         ssize_t err = NUM2INT(ret);
         if (err == NGHTTP2_ERR_DEFERRED) {
             return err;
         }
     }
 
+    if (NIL_P(ret) || (rb_respond_to(body, id_eof_p) && RTEST(rb_funcall(body, id_eof_p, 0)))) {
+	VALUE self = (VALUE)user_data;
+	rb_funcall(self, rb_intern("remove_post_buffer"), 1, INT2NUM(stream_id));
+	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
+    }
+
+    if (NIL_P(ret)) {
+	return 0;
+    }
+
     Check_Type(ret, T_STRING);
     memcpy(buf, RSTRING_PTR(ret), RSTRING_LEN(ret));
     return RSTRING_LEN(ret);
@@ -633,8 +644,8 @@ file_read(nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t leng
 
 static VALUE session_submit_request(VALUE self, VALUE settings, VALUE body)
 {
-    size_t niv, i;
-    nghttp2_nv *nva, *head;
+    size_t niv;
+    nghttp2_nv *nva;
     nghttp2_session *session;
     nghttp2_data_provider provider;
     int rv;
@@ -655,6 +666,7 @@ static VALUE session_submit_request(VALUE self, VALUE settings, VALUE body)
 	    break;
 	default:
 	    Check_Type(settings, T_ARRAY);
+	    UNREACHABLE;
     }
 
     nva = xcalloc(niv, sizeof(nghttp2_nv));
@@ -671,7 +683,7 @@ static VALUE session_submit_request(VALUE self, VALUE settings, VALUE body)
 	    provider.source.ptr = rb_file;
 	    provider.read_callback = file_read;
 	} else {
-	    provider.source.ptr = body;
+	    provider.source.ptr = (void *)body;
 	    provider.read_callback = ruby_read;
 	}
 
@@ -826,7 +838,7 @@ static VALUE server_submit_response(VALUE self, VALUE stream_id, VALUE headers)
 {
     nghttp2_session *session;
     size_t niv;
-    nghttp2_nv *nva, *head;
+    nghttp2_nv *nva;
     nghttp2_data_provider provider;
     int rv;
     copy_header_func_t copy_func;
@@ -846,6 +858,7 @@ static VALUE server_submit_response(VALUE self, VALUE stream_id, VALUE headers)
 	    break;
 	default:
 	    Check_Type(headers, T_ARRAY);
+	    UNREACHABLE;
     }
 
     nva = xcalloc(niv, sizeof(nghttp2_nv));
@@ -868,7 +881,7 @@ static VALUE server_submit_response(VALUE self, VALUE stream_id, VALUE headers)
 static VALUE server_submit_headers(VALUE self, VALUE stream_id, VALUE headers) {
     nghttp2_session *session;
     size_t niv;
-    nghttp2_nv *nva, *head;
+    nghttp2_nv *nva;
     int rv;
     copy_header_func_t copy_func;
 
@@ -887,6 +900,7 @@ static VALUE server_submit_headers(VALUE self, VALUE stream_id, VALUE headers) {
 	    break;
 	default:
 	    Check_Type(headers, T_ARRAY);
+	    UNREACHABLE;
     }
 
     nva = xcalloc(niv, sizeof(nghttp2_nv));
@@ -1010,6 +1024,7 @@ void Init_ds9(void)
     mDS9 = rb_define_module("DS9");
 
     Init_ds9_frames(mDS9);
+    Init_ds9_option(mDS9);
 
     rb_define_const(mDS9, "PROTO_VERSION_ID", rb_str_new(NGHTTP2_PROTO_VERSION_ID, NGHTTP2_PROTO_VERSION_ID_LEN));
 
@@ -1027,6 +1042,7 @@ void Init_ds9(void)
     rb_define_const(mDS9, "ERR_WOULDBLOCK", INT2NUM(NGHTTP2_ERR_WOULDBLOCK));
     rb_define_const(mDS9, "ERR_EOF", INT2NUM(NGHTTP2_ERR_EOF));
     rb_define_const(mDS9, "ERR_DEFERRED", INT2NUM(NGHTTP2_ERR_DEFERRED));
+    rb_define_const(mDS9, "ERR_BAD_CLIENT_MAGIC", INT2NUM(NGHTTP2_ERR_BAD_CLIENT_MAGIC));
     rb_define_const(mDS9, "NO_ERROR", INT2NUM(NGHTTP2_NO_ERROR));
     rb_define_const(mDS9, "DEFAULT_WEIGHT", INT2NUM(NGHTTP2_DEFAULT_WEIGHT));
     rb_define_const(mDS9, "MAX_WEIGHT", INT2NUM(NGHTTP2_MAX_WEIGHT));
@@ -1039,7 +1055,7 @@ void Init_ds9(void)
 
     rb_define_singleton_method(mDS9, "nghttp_version", rb_nghttp_version, 0);
 
-    cDS9Callbacks = rb_define_class_under(mDS9, "Callbacks", rb_cData);
+    cDS9Callbacks = rb_define_class_under(mDS9, "Callbacks", rb_cObject);
 
     cDS9Session = rb_define_class_under(mDS9, "Session", rb_cObject);
     cDS9Client = rb_define_class_under(mDS9, "Client", cDS9Session);
@@ -1065,8 +1081,8 @@ void Init_ds9(void)
 
     rb_define_private_method(cDS9Session, "submit_request", session_submit_request, 2);
     rb_define_private_method(cDS9Session, "make_callbacks", make_callbacks, 0);
-    rb_define_private_method(cDS9Client, "init_internals", client_init_internals, 1);
-    rb_define_private_method(cDS9Server, "init_internals", server_init_internals, 1);
+    rb_define_private_method(cDS9Client, "init_internals", client_init_internals, 2);
+    rb_define_private_method(cDS9Server, "init_internals", server_init_internals, 2);
 
     rb_define_method(cDS9Server, "submit_response", server_submit_response, 2);
     rb_define_method(cDS9Server, "submit_push_promise", server_submit_push_promise, 2);
@@ -1089,6 +1105,7 @@ void Init_ds9(void)
     id_on_data_chunk_recv    = rb_intern("on_data_chunk_recv");
     id_before_frame_send     = rb_intern("before_frame_send");
     id_on_data_source_read   = rb_intern("on_data_source_read");
+    id_eof_p                 = rb_intern("eof?");
 }
 
 /* vim: set noet sws=4 sw=4: */

data/ext/ds9/ds9.h

@@ -4,6 +4,7 @@
 #include <ruby.h>
 #include <ruby/io.h>
 #include <nghttp2/nghttp2.h>
+#include <ds9_option.h>
 
 static const rb_data_type_t ds9_session_type = {
     "DS9/session",

data/ext/ds9/ds9_frames.c

@@ -45,7 +45,7 @@ VALUE WrapDS9FrameHeader(const nghttp2_frame_hd *hd)
 {
     VALUE klass = rb_const_get(cDS9FramesFrame, rb_intern("Header"));
     return rb_funcall(klass, rb_intern("new"), 4,
-	    INT2NUM(hd->length),
+	    ULONG2NUM(hd->length),
 	    INT2NUM(hd->stream_id),
 	    INT2NUM(hd->type),
 	    INT2NUM(hd->flags));
@@ -127,7 +127,7 @@ static VALUE goaway_error_code(VALUE self)
 void Init_ds9_frames(VALUE mDS9)
 {
     mDS9Frames = rb_define_module_under(mDS9, "Frames");
-    cDS9FramesFrame = rb_define_class_under(mDS9Frames, "Frame", rb_cData);
+    cDS9FramesFrame = rb_define_class_under(mDS9Frames, "Frame", rb_cObject);
 
     mDS9FramesFlags = rb_define_module_under(cDS9FramesFrame, "Flags");
 

data/ext/ds9/ds9_option.c

@@ -0,0 +1,183 @@
+#include <ds9_option.h>
+
+VALUE cDS9Option;
+
+static VALUE allocate_option(VALUE klass)
+{
+    nghttp2_option *option;
+
+    nghttp2_option_new(&option);
+
+    return TypedData_Wrap_Struct(klass, &ds9_option_type, option);
+}
+
+static VALUE option_set_no_auto_ping_ack(VALUE self)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_no_auto_ping_ack(option, 1);
+
+    return self;
+}
+
+static VALUE option_set_no_auto_window_update(VALUE self)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_no_auto_window_update(option, 1);
+
+    return self;
+}
+
+static VALUE option_set_no_closed_streams(VALUE self)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_no_closed_streams(option, 1);
+
+    return self;
+}
+
+static VALUE option_set_no_http_messaging(VALUE self)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_no_http_messaging(option, 1);
+
+    return self;
+}
+
+static VALUE option_set_no_recv_client_magic(VALUE self)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_no_recv_client_magic(option, 1);
+
+    return self;
+}
+
+
+static VALUE option_set_builtin_recv_extension_type(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_builtin_recv_extension_type(option, NUM2INT(size));
+
+    return self;
+}
+
+static VALUE option_set_max_deflate_dynamic_table_size(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_max_deflate_dynamic_table_size(option, NUM2INT(size));
+
+    return self;
+}
+
+static VALUE option_set_max_send_header_block_length(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_max_send_header_block_length(option, NUM2INT(size));
+
+    return self;
+}
+
+static VALUE option_set_max_reserved_remote_streams(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_max_reserved_remote_streams(option, NUM2INT(size));
+
+    return self;
+}
+
+static VALUE option_set_peer_max_concurrent_streams(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_peer_max_concurrent_streams(option, NUM2INT(size));
+
+    return self;
+}
+
+static VALUE option_set_user_recv_extension_type(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_user_recv_extension_type(option, NUM2INT(size));
+
+    return self;
+}
+
+#if NGHTTP2_VERSION_NUM >= 0x012800 /* 1.40.0 */
+static VALUE option_set_max_outbound_ack(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_max_outbound_ack(option, NUM2INT(size));
+
+    return self;
+}
+#endif
+
+#if NGHTTP2_VERSION_NUM >= 0x012900 /* 1.41.0 */
+static VALUE option_set_max_settings(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_max_settings(option, NUM2INT(size));
+
+    return self;
+}
+#endif
+
+nghttp2_option* UnwrapDS9Option(VALUE opt)
+{
+    nghttp2_option* option = NULL;
+
+    if (!NIL_P(opt)) {
+	TypedData_Get_Struct(opt, nghttp2_option, &ds9_option_type, option);
+    }
+
+    return option;
+}
+
+void Init_ds9_option(VALUE mDS9)
+{
+    cDS9Option = rb_define_class_under(mDS9, "Option", rb_cObject);
+    rb_define_alloc_func(cDS9Option, allocate_option);
+
+    rb_define_method(cDS9Option, "set_no_auto_ping_ack", option_set_no_auto_ping_ack, 0);
+    rb_define_method(cDS9Option, "set_no_auto_window_update", option_set_no_auto_window_update, 0);
+    rb_define_method(cDS9Option, "set_no_closed_streams", option_set_no_closed_streams, 0);
+    rb_define_method(cDS9Option, "set_no_http_messaging", option_set_no_http_messaging, 0);
+    rb_define_method(cDS9Option, "set_no_recv_client_magic", option_set_no_recv_client_magic, 0);
+
+    rb_define_method(cDS9Option, "set_builtin_recv_extension_type", option_set_builtin_recv_extension_type, 1);
+    rb_define_method(cDS9Option, "set_max_deflate_dynamic_table_size", option_set_max_deflate_dynamic_table_size, 1);
+    rb_define_method(cDS9Option, "set_max_send_header_block_length", option_set_max_send_header_block_length, 1);
+    rb_define_method(cDS9Option, "set_max_reserved_remote_streams", option_set_max_reserved_remote_streams, 1);
+    rb_define_method(cDS9Option, "set_peer_max_concurrent_streams", option_set_peer_max_concurrent_streams, 1);
+    rb_define_method(cDS9Option, "set_user_recv_extension_type", option_set_user_recv_extension_type, 1);
+#if NGHTTP2_VERSION_NUM >= 0x012800 /* 1.40.0 */
+    rb_define_method(cDS9Option, "set_max_outbound_ack", option_set_max_outbound_ack, 1);
+#endif
+#if NGHTTP2_VERSION_NUM >= 0x012900 /* 1.41.0 */
+    rb_define_method(cDS9Option, "set_max_settings", option_set_max_settings, 1);
+#endif
+}

data/ext/ds9/ds9_option.h

@@ -0,0 +1,19 @@
+#ifndef DS9_OPTION_H
+#define DS9_OPTION_H
+
+#include <ruby.h>
+#include <nghttp2/nghttp2.h>
+
+static const rb_data_type_t ds9_option_type = {
+    "DS9/option",
+    {0, (void (*)(void *))nghttp2_option_del, 0,},
+    0, 0,
+#ifdef RUBY_TYPED_FREE_IMMEDIATELY
+    RUBY_TYPED_FREE_IMMEDIATELY,
+#endif
+};
+
+void Init_ds9_option(VALUE mDS9);
+nghttp2_option* UnwrapDS9Option(VALUE opt);
+
+#endif

data/ext/ds9/extconf.rb

@@ -4,6 +4,8 @@ def using_system_libraries?
   arg_config('--use-system-libraries', !!ENV['DS9_USE_SYSTEM_LIBRARIES'])
 end
 
+dir_config('ds9')
+
 if using_system_libraries?
   if with_config("static")
     ldflags = pkg_config 'libnghttp2', 'libs-only-L'
@@ -21,20 +23,19 @@ else
   message "Building nghttp2\n"
   require 'rubygems'
   require 'mini_portile2'
-  recipe = MiniPortile.new('nghttp2', 'v1.34.0')
-  # We need to compile nghttp2 with `-fPIC` option, so delete `--disable-shared` from MiniPortile#configure_defaults
-  recipe.configure_options = ['--enable-lib-only', '--enable-static', "--host=#{recipe.host}"]
+  recipe = MiniPortile.new('nghttp2', 'v1.43.0')
+  recipe.configure_options = recipe.configure_options + ['--with-pic', '--enable-lib-only']
 
   recipe.files << {
-    url: 'https://github.com/nghttp2/nghttp2/releases/download/v1.34.0/nghttp2-1.34.0.tar.gz',
-    sha1: '2d0ad93a254a7a6e6c737f2fd2e10e4810a41f74',
+    url: 'https://github.com/nghttp2/nghttp2/releases/download/v1.43.0/nghttp2-1.43.0.tar.gz',
+    sha1: '8686c8ceee769de8b9e304739b223981df9df104',
   }
   recipe.cook
 
   # `recipe.activate` uses invalid path for this package.
   $LIBPATH = ["#{recipe.path}/lib"] + $LIBPATH
   $CPPFLAGS << " -I#{recipe.path}/include"
-  $LIBS << " -lnghttp2 -lstdc++"
+  $LIBS << " -lstdc++"
 end
 
 abort 'nghttp2/nghttp2.h not found' unless have_header('nghttp2/nghttp2.h')

data/lib/ds9.rb

@@ -75,10 +75,11 @@ module DS9
   end
 
   class Session
-    def initialize
+    # @param option [DS9::Option]
+    def initialize(option: nil)
       @post_buffers = {}
       cbs = make_callbacks
-      init_internals cbs
+      init_internals(cbs, option)
     end
 
     private

data/lib/ds9/version.rb

@@ -1,3 +1,3 @@
 module DS9
-  VERSION = '1.3.1'
+  VERSION = '1.4.2'
 end

data/test/helper.rb

@@ -12,7 +12,7 @@ trap("INFO") {
     puts k.backtrace
     puts "#" * 90
   end
-}
+} if Signal.list.key?("INFO")
 
 module DS9
   class TestCase < Minitest::Test

data/test/test_ds9_option.rb

@@ -0,0 +1,107 @@
+require 'helper'
+
+class TestMeme < Minitest::Test
+  def setup
+    @option = DS9::Option.new
+  end
+
+  def test_set_no_auto_ping_ack
+    assert @option.set_no_auto_ping_ack
+  end
+
+  def test_set_no_auto_window_update
+    assert @option.set_no_auto_window_update
+  end
+
+  def test_set_no_closed_streams
+    assert @option.set_no_closed_streams
+  end
+
+  def test_set_no_http_messaging
+    assert @option.set_no_http_messaging
+  end
+
+  def test_set_no_recv_client_magic
+    assert @option.set_no_recv_client_magic
+  end
+
+  def test_set_builtin_recv_extension_type
+    assert @option.set_builtin_recv_extension_type(1)
+  end
+
+  def test_set_builtin_recv_extension_type_with_not_num
+    assert_raises TypeError do
+      assert @option.set_builtin_recv_extension_type('invalid')
+    end
+  end
+
+  def test_set_max_deflate_dynamic_table_size
+    assert @option.set_max_deflate_dynamic_table_size(1)
+  end
+
+  def test_set_max_deflate_dynamic_table_size_with_not_num
+    assert_raises TypeError do
+      @option.set_max_deflate_dynamic_table_size('invalid')
+    end
+  end
+
+  def test_set_max_send_header_block_length
+    assert @option.set_max_send_header_block_length(1)
+  end
+
+  def test_set_max_send_header_block_length_with_not_num
+    assert_raises TypeError do
+      assert @option.set_max_send_header_block_length('invalid')
+    end
+  end
+
+  def test_set_max_reserved_remote_streams
+    assert @option.set_max_reserved_remote_streams(100)
+  end
+
+  def test_set_max_reserved_remote_streams_not_num
+    assert_raises TypeError do
+      @option.set_max_reserved_remote_streams('invalid')
+    end
+  end
+
+  def test_set_peer_max_concurrent_streams
+    assert @option.set_peer_max_concurrent_streams(1)
+  end
+
+  def test_set_peer_max_concurrent_stream_with_not_num
+    assert_raises TypeError do
+      assert @option.set_peer_max_concurrent_streams('invalid')
+    end
+  end
+
+  def test_set_user_recv_extension_type
+    assert @option.set_user_recv_extension_type(1)
+  end
+
+  def test_set_user_recv_extension_type_with_not_num
+    assert_raises TypeError do
+      assert @option.set_user_recv_extension_type('invalid')
+    end
+  end
+
+  def test_set_max_outbound_ack
+    assert @option.set_max_outbound_ack(100)
+  end
+
+  def test_set_max_outbound_ack_with_not_num
+    assert_raises TypeError do
+      assert @option.set_max_outbound_ack('invalid')
+    end
+  end
+
+  def test_set_max_settings
+    assert @option.set_max_settings(16)
+  end
+
+  def test_set_max_settings_with_not_num
+    assert_raises TypeError do
+      assert @option.set_max_settings('invalid')
+    end
+  end
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: ds9
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Aaron Patterson
 - Yuta Iwama
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-07-06 00:00:00.000000000 Z
@@ -95,6 +95,7 @@ extra_rdoc_files:
 - README.md
 files:
 - ".autotest"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
@@ -104,18 +105,21 @@ files:
 - ext/ds9/ds9.c
 - ext/ds9/ds9.h
 - ext/ds9/ds9_frames.c
+- ext/ds9/ds9_option.c
+- ext/ds9/ds9_option.h
 - ext/ds9/extconf.rb
 - lib/ds9.rb
 - lib/ds9/version.rb
 - test/helper.rb
 - test/test_client.rb
 - test/test_ds9.rb
+- test/test_ds9_option.rb
 - test/test_server.rb
 homepage: https://github.com/tenderlove/ds9
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -132,9 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
-signing_key: 
+rubygems_version: 3.2.14
+signing_key:
 specification_version: 4
 summary: This library allows you to write HTTP/2 clients and servers
 test_files: []