1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merges r30213 from trunk into ruby_1_9_2.

--
        * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
	  fix compile error when !HAVE_X509V3_SET_NCONF. Thanks
	  Chikanaga-san. [ruby-dev:42761] [Ruby 1.9-Bug#4158]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-12-23 12:45:44 +00:00
parent 5ef68cb63f
commit 6a1ab2d311
3 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
Wed Dec 15 04:02:00 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
fix compile error when !HAVE_X509V3_SET_NCONF. Thanks
Chikanaga-san. [ruby-dev:42761] [Ruby 1.9-Bug#4158]
Sat Dec 11 05:48:28 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: infinite loop on method_missing at loading.

View file

@ -178,7 +178,7 @@ ossl_x509extfactory_set_config(VALUE self, VALUE config)
return config;
}
#else
#define rb_f_fork rb_f_notimplement
#define ossl_x509extfactory_set_config rb_f_notimplement
#endif
static VALUE

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 125
#define RUBY_PATCHLEVEL 126
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1