ds9 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42d51fe49ecbc5b632752422632d97684cf61174
-  data.tar.gz: c5858839be9feb5000e2faba3ea307e17ab3bdc1
+  metadata.gz: 2c4e36345289f23d14f435bc4cb397a72a5bda5d
+  data.tar.gz: 142a14a755b07d0ea718f3de691fb87fed448ed3
 SHA512:
-  metadata.gz: 1be38862c11864eacb2a172822401fdcb6276af652608c1b8223681bdf374461e74c50e220dee1afba6aabbe491798e7238a157b4be28fcb0feb1bb877b05d12
-  data.tar.gz: 0320c3c379461605ecd04697798a483d0029b86800ed8167949b550ace6c39f249408884109be357707a146f458c25b2ded16cc6d18ae36a211272b2da89a72e
+  metadata.gz: 52385947712d95677a593d18a16e81bbe9332042854537fcc4734fb8e5f39fb15e65380349725abe5d5ebedc9f3c6b97da573ffd18a10cc4b260924aac30551d
+  data.tar.gz: fcf9414805469006684c1ecd1a30297322892baa0e3d04804688aba6949a90b77ea0eecf99981f0ca3ae18315b6399947e75d74d649de49dd668c50e746d8ce6

data/ext/ds9/ds9.c

@@ -283,6 +283,13 @@ static ssize_t rb_data_read_callback(nghttp2_session *session,
 	return 0;
     }
 
+    if (FIXNUM_P(ret)) {
+        ssize_t err = NUM2INT(ret);
+        if (err == NGHTTP2_ERR_DEFERRED) {
+            return err;
+        }
+    }
+
     Check_Type(ret, T_STRING);
     len = RSTRING_LEN(ret);
     memcpy(buf, StringValuePtr(ret), len);
@@ -588,12 +595,16 @@ ruby_read(nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t leng
 	rb_funcall(self, rb_intern("remove_post_buffer"), 1, INT2NUM(stream_id));
 	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
 	return 0;
-    } else if (ret == Qfalse) {
-      return NGHTTP2_ERR_DEFERRED;
-    } else {
-	memcpy(buf, RSTRING_PTR(ret), RSTRING_LEN(ret));
-	return RSTRING_LEN(ret);
+    } else if (FIXNUM_P(ret)) {
+        ssize_t err = NUM2INT(ret);
+        if (err == NGHTTP2_ERR_DEFERRED) {
+            return err;
+        }
     }
+
+    Check_Type(ret, T_STRING);
+    memcpy(buf, RSTRING_PTR(ret), RSTRING_LEN(ret));
+    return RSTRING_LEN(ret);
 }
 
 static ssize_t
@@ -854,6 +865,46 @@ static VALUE server_submit_response(VALUE self, VALUE stream_id, VALUE headers)
     return self;
 }
 
+static VALUE server_submit_headers(VALUE self, VALUE stream_id, VALUE headers) {
+    nghttp2_session *session;
+    size_t niv;
+    nghttp2_nv *nva, *head;
+    int rv;
+    copy_header_func_t copy_func;
+
+    TypedData_Get_Struct(self, nghttp2_session, &ds9_session_type, session);
+    CheckSelf(session);
+
+    switch(TYPE(headers))
+    {
+	case T_ARRAY:
+	    niv = RARRAY_LEN(headers);
+	    copy_func = copy_list_to_nv;
+	    break;
+	case T_HASH:
+	    niv = RHASH_SIZE(headers);
+	    copy_func = copy_hash_to_nv;
+	    break;
+	default:
+	    Check_Type(headers, T_ARRAY);
+    }
+
+    nva = xcalloc(niv, sizeof(nghttp2_nv));
+
+    copy_func(headers, nva, niv);
+
+    /* nghttp2_submit_headers is too low level API for ds9 */
+    rv = nghttp2_submit_response(session, NUM2INT(stream_id), nva, niv, NULL);
+
+    xfree(nva);
+
+    if (0 != rv) {
+	explode(rv);
+    }
+
+    return self;
+}
+
 static VALUE make_callbacks(VALUE self)
 {
     nghttp2_session_callbacks *callbacks;
@@ -975,6 +1026,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, "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));
@@ -1020,6 +1072,7 @@ void Init_ds9(void)
     rb_define_method(cDS9Server, "submit_push_promise", server_submit_push_promise, 2);
     rb_define_method(cDS9Server, "submit_shutdown", session_submit_shutdown, 0);
     rb_define_method(cDS9Server, "submit_trailer", session_submit_trailer, 2);
+    rb_define_method(cDS9Server, "submit_headers", server_submit_headers, 2);
 
     rb_define_singleton_method(eDS9Exception, "to_string", errors_to_string, 1);
 

data/lib/ds9.rb

@@ -2,7 +2,7 @@ require 'ds9.so'
 require 'stringio'
 
 module DS9
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 
   module Frames
     class Frame

data/test/helper.rb

@@ -205,6 +205,10 @@ module DS9
           stream.submit_response stream_id, headers
         end
 
+        def submit_headers headers
+          stream.submit_headers stream_id, headers
+        end
+
         def finish str
           body << str
           body << nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ds9
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: This library allows you to write HTTP/2 clients and servers