Skip to content

Commit b62d9a5

Browse files
committed
Remove default_stream_mode=
1 parent 3a28e67 commit b62d9a5

1 file changed

Lines changed: 2 additions & 33 deletions

File tree

ext/openssl/ossl_ssl.c

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,6 +1743,8 @@ ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
17431743
// Always set non-blocking mode for QUIC connections
17441744
// This is a no-op on non-QUIC connections
17451745
SSL_set_blocking_mode(ssl, 0);
1746+
// This is also a no-op on non-QUIC connections
1747+
SSL_set_default_stream_mode(ssl, SSL_DEFAULT_STREAM_MODE_NONE);
17461748
#endif
17471749

17481750
rb_call_super(0, NULL);
@@ -2912,38 +2914,6 @@ ossl_ssl_stream_id(VALUE self)
29122914
return ULL2NUM(id);
29132915
}
29142916

2915-
/*
2916-
* call-seq:
2917-
* ssl.default_stream_mode = mode
2918-
*
2919-
* Sets the default stream mode for a QUIC connection. +mode+ should be
2920-
* one of the symbols :none, :auto_bidi, or :auto_uni.
2921-
*/
2922-
static VALUE
2923-
ossl_ssl_set_default_stream_mode(VALUE self, VALUE mode)
2924-
{
2925-
SSL *ssl;
2926-
uint32_t m;
2927-
ID mode_id;
2928-
2929-
GetSSL(self, ssl);
2930-
2931-
mode_id = SYM2ID(mode);
2932-
if (mode_id == rb_intern("none"))
2933-
m = SSL_DEFAULT_STREAM_MODE_NONE;
2934-
else if (mode_id == rb_intern("auto_bidi"))
2935-
m = SSL_DEFAULT_STREAM_MODE_AUTO_BIDI;
2936-
else if (mode_id == rb_intern("auto_uni"))
2937-
m = SSL_DEFAULT_STREAM_MODE_AUTO_UNI;
2938-
else
2939-
ossl_raise(rb_eArgError, "unknown default stream mode");
2940-
2941-
if (!SSL_set_default_stream_mode(ssl, m))
2942-
ossl_raise(eSSLError, "SSL_set_default_stream_mode");
2943-
2944-
return mode;
2945-
}
2946-
29472917
/*
29482918
* call-seq:
29492919
* ssl.handle_events => nil
@@ -3737,7 +3707,6 @@ Init_ossl_ssl(void)
37373707
rb_define_method(cSSLSocket, "accept_stream", ossl_ssl_accept_stream, -1);
37383708
rb_define_method(cSSLSocket, "stream_conclude", ossl_ssl_stream_conclude, 0);
37393709
rb_define_method(cSSLSocket, "stream_id", ossl_ssl_stream_id, 0);
3740-
rb_define_method(cSSLSocket, "default_stream_mode=", ossl_ssl_set_default_stream_mode, 1);
37413710
rb_define_method(cSSLSocket, "handle_events", ossl_ssl_handle_events, 0);
37423711
rb_define_method(cSSLSocket, "net_read_desired?", ossl_ssl_net_read_desired, 0);
37433712
rb_define_method(cSSLSocket, "net_write_desired?", ossl_ssl_net_write_desired, 0);

0 commit comments

Comments
 (0)