yugui	2011-05-30 07:48:25 +0900 (Mon, 30 May 2011)

  New Revision: 31791

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31791

  Log:
    merges r31162 from trunk into ruby_1_9_2.
    --
    * ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify): flags is VALUE,
      so it should use NUM2INT.
    
    * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): ditto.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/openssl/ossl_ocsp.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31790)
+++ ruby_1_9_2/ChangeLog	(revision 31791)
@@ -1,3 +1,10 @@
+Thu Mar 24 09:56:19 2011  NARUSE, Yui  <naruse@r...>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify): flags is VALUE,
+	  so it should use NUM2INT.
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): ditto.
+
 Wed Mar 23 08:07:33 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* numeric.c (flo_round): fix inaccurate results.
Index: ruby_1_9_2/ext/openssl/ossl_ocsp.c
===================================================================
--- ruby_1_9_2/ext/openssl/ossl_ocsp.c	(revision 31790)
+++ ruby_1_9_2/ext/openssl/ossl_ocsp.c	(revision 31791)
@@ -245,7 +245,7 @@
 
     rb_scan_args(argc, argv, "21", &certs, &store, &flags);
     x509st = GetX509StorePtr(store);
-    flg = NIL_P(flags) ? 0 : INT2NUM(flags);
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     x509s = ossl_x509_ary2sk(certs);
     GetOCSPReq(self, req);
     result = OCSP_request_verify(req, x509s, x509st, flg);
@@ -601,7 +601,7 @@
 
     rb_scan_args(argc, argv, "21", &certs, &store, &flags);
     x509st = GetX509StorePtr(store);
-    flg = NIL_P(flags) ? 0 : INT2NUM(flags);
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     x509s = ossl_x509_ary2sk(certs);
     GetOCSPBasicRes(self, bs);
     result = OCSP_basic_verify(bs, x509s, x509st, flg) > 0 ? Qtrue : Qfalse;
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31790)
+++ ruby_1_9_2/version.h	(revision 31791)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 218
+#define RUBY_PATCHLEVEL 219
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/