[前][次][番号順一覧][スレッド一覧]

ruby-changes:16228

From: shyouhei <ko1@a...>
Date: Mon, 7 Jun 2010 19:09:22 +0900 (JST)
Subject: [ruby-changes:16228] Ruby:r28194 (ruby_1_8_7): merge revision(s) 26850:

shyouhei	2010-06-07 19:07:53 +0900 (Mon, 07 Jun 2010)

  New Revision: 28194

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

  Log:
    merge revision(s) 26850:
    * ext/openssl/ossl_ssl_session.c
      (ossl_ssl_session_{get,set}_time{,out}): fixed a bug introduced by
      backporting. (see [ruby-dev:40573])  use long in according to
      OpenSSL API. (SSL_SESSION_{get,set}_time{,out})

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/openssl/ossl_ssl_session.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/openssl/ossl_ssl_session.c
===================================================================
--- ruby_1_8_7/ext/openssl/ossl_ssl_session.c	(revision 28193)
+++ ruby_1_8_7/ext/openssl/ossl_ssl_session.c	(revision 28194)
@@ -100,7 +100,7 @@
 static VALUE ossl_ssl_session_get_time(VALUE self)
 {
 	SSL_SESSION *ctx;
-	time_t t;
+	long t;
 
 	GetSSLSession(self, ctx);
 
@@ -109,7 +109,7 @@
 	if (t == 0)
 		return Qnil;
 
-	return rb_funcall(rb_cTime, rb_intern("at"), 1, TIMET2NUM(t));
+	return rb_funcall(rb_cTime, rb_intern("at"), 1, LONG2NUM(t));
 }
 
 /*
@@ -122,20 +122,20 @@
 static VALUE ossl_ssl_session_get_timeout(VALUE self)
 {
 	SSL_SESSION *ctx;
-	time_t t;
+	long t;
 
 	GetSSLSession(self, ctx);
 
 	t = SSL_SESSION_get_timeout(ctx);
 
-	return TIMET2NUM(t);
+	return LONG2NUM(t);
 }
 
 #define SSLSESSION_SET_TIME(func)						\
 	static VALUE ossl_ssl_session_set_##func(VALUE self, VALUE time_v)	\
 	{									\
 		SSL_SESSION *ctx;						\
-		unsigned long t;						\
+		long t;								\
 										\
 		GetSSLSession(self, ctx);					\
 										\
@@ -147,7 +147,7 @@
 			rb_raise(rb_eArgError, "unknown type");			\
 		}								\
 										\
-		t = NUM2ULONG(time_v);						\
+		t = NUM2LONG(time_v);						\
 										\
 		SSL_SESSION_set_##func(ctx, t);					\
 										\
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 28193)
+++ ruby_1_8_7/ChangeLog	(revision 28194)
@@ -1,3 +1,10 @@
+Mon Jun  7 18:57:02 2010  NAKAMURA, Hiroshi  <nahi@r...>
+
+	* ext/openssl/ossl_ssl_session.c
+	  (ossl_ssl_session_{get,set}_time{,out}): fixed a bug introduced by
+	  backporting. (see [ruby-dev:40573])  use long in according to
+	  OpenSSL API. (SSL_SESSION_{get,set}_time{,out})
+
 Tue May 25 08:42:42 2010  NAKAMURA, Hiroshi  <nahi@r...>
 
 	* ext/openssl: backport fixes in 1.9.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 28193)
+++ ruby_1_8_7/version.h	(revision 28194)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2010-05-25"
+#define RUBY_RELEASE_DATE "2010-06-07"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20100525
-#define RUBY_PATCHLEVEL 266
+#define RUBY_RELEASE_CODE 20100607
+#define RUBY_PATCHLEVEL 267
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2010
-#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_MONTH 6
+#define RUBY_RELEASE_DAY 7
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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

[前][次][番号順一覧][スレッド一覧]