diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-09-17 19:10:57 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-09-17 19:10:57 +0900 |
| commit | 4eda40878fc42ac5bad6dd7b1ebc8f0eac796b94 (patch) | |
| tree | 20823641e33f02500a69a3c79b827354fe63a4dc /ext | |
| parent | 3cc4cf37ecb68f2cb7af5af4f81b909c9462a905 (diff) | |
| parent | 368b26eccf5f4c9bfa9c0aa997073263594dda68 (diff) | |
| download | ruby-openssl-4eda40878fc42ac5bad6dd7b1ebc8f0eac796b94.tar.gz | |
Merge changes from Ruby trunk r56028..r56173
* ruby-trunk r56028..r56173: (3 commits)
(r56173) * ext/openssl/ossl_ssl.c (ssl_npn_select_cb_common): Fix co..
(r56147) openssl: workaround for Ubuntu's patched OpenSSL
(r56098) openssl: import v2.0.0.beta.2
Sync-with-trunk: r56173
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 053613ad..861f820d 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -636,7 +636,11 @@ ssl_npn_select_cb_common(SSL *ssl, VALUE cb, const unsigned char **out, { VALUE selected; int status; - struct npn_select_cb_common_args args = { cb, in, inlen }; + struct npn_select_cb_common_args args; + + args.cb = cb; + args.in = in; + args.inlen = inlen; selected = rb_protect(npn_select_cb_common_i, (VALUE)&args, &status); if (status) { |