ruby-changes:33697
From: nagachika <ko1@a...>
Date: Fri, 2 May 2014 00:23:15 +0900 (JST)
Subject: [ruby-changes:33697] nagachika:r45778 (ruby_2_1): merge revision(s) r45271: [Backport #9592] [Backport #9671]
nagachika 2014-05-02 00:23:08 +0900 (Fri, 02 May 2014) New Revision: 45778 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45778 Log: merge revision(s) r45271: [Backport #9592] [Backport #9671] * ext/openssl/ossl.c (ossl_make_error): check NULL for unknown error reasons with old OpenSSL, and insert a colon iff formatted message is not empty. Modified directories: branches/ruby_2_1/ Modified files: branches/ruby_2_1/ChangeLog branches/ruby_2_1/ext/openssl/ossl.c branches/ruby_2_1/version.h Index: ruby_2_1/ChangeLog =================================================================== --- ruby_2_1/ChangeLog (revision 45777) +++ ruby_2_1/ChangeLog (revision 45778) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1 +Fri May 2 00:19:36 2014 Nobuyoshi Nakada <nobu@r...> + + * ext/openssl/ossl.c (ossl_make_error): check NULL for unknown + error reasons with old OpenSSL, and insert a colon iff formatted + message is not empty. + Thu May 1 20:56:56 2014 Nobuyoshi Nakada <nobu@r...> * ext/readline/extconf.rb (rl_hook_func_t): check pointer type. Index: ruby_2_1/ext/openssl/ossl.c =================================================================== --- ruby_2_1/ext/openssl/ossl.c (revision 45777) +++ ruby_2_1/ext/openssl/ossl.c (revision 45778) @@ -311,10 +311,11 @@ ossl_make_error(VALUE exc, const char *f https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/openssl/ossl.c#L311 else msg = ERR_reason_error_string(e); if (NIL_P(str)) { - str = rb_str_new_cstr(msg); + if (msg) str = rb_str_new_cstr(msg); } else { - rb_str_cat2(rb_str_cat2(str, ": "), msg); + if (RSTRING_LEN(str)) rb_str_cat2(str, ": "); + rb_str_cat2(str, msg ? msg : "(null)"); } } if (dOSSL == Qtrue){ /* show all errors on the stack */ Index: ruby_2_1/version.h =================================================================== --- ruby_2_1/version.h (revision 45777) +++ ruby_2_1/version.h (revision 45778) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1 #define RUBY_VERSION "2.1.2" -#define RUBY_RELEASE_DATE "2014-05-01" -#define RUBY_PATCHLEVEL 82 +#define RUBY_RELEASE_DATE "2014-05-02" +#define RUBY_PATCHLEVEL 83 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" Property changes on: ruby_2_1 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r45271 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/