naruse	2014-01-27 16:47:11 +0900 (Mon, 27 Jan 2014)

  New Revision: 44710

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

  Log:
    merge revision(s) 44402: [Backport #9301]
    
    * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant
      `OP_MSIE_SSLV2_RSA_PADDING` only if the macro is defined.  The
      `SSL_OP_MSIE_SSLV2_RSA_PADDING` has been removed from latest
      snapshot of OpenSSL 1.0.1.  [Fixes GH-488]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/openssl/ossl_ssl.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 44709)
+++ ruby_2_1/ChangeLog	(revision 44710)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Jan 27 16:45:34 2014  Yamashita Yuu  <yamashita@g...>
+
+	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant
+	  `OP_MSIE_SSLV2_RSA_PADDING` only if the macro is defined.  The
+	  `SSL_OP_MSIE_SSLV2_RSA_PADDING` has been removed from latest
+	  snapshot of OpenSSL 1.0.1.  [Fixes GH-488]
+
 Thu Jan 23 10:37:24 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* hash.c (HAS_EXTRA_STATES): warn extra states only when something
Index: ruby_2_1/ext/openssl/ossl_ssl.c
===================================================================
--- ruby_2_1/ext/openssl/ossl_ssl.c	(revision 44709)
+++ ruby_2_1/ext/openssl/ossl_ssl.c	(revision 44710)
@@ -2229,7 +2229,9 @@ Init_ossl_ssl() https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/openssl/ossl_ssl.c#L2229
     ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
     ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG);
     ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER);
+#if defined(SSL_OP_MSIE_SSLV2_RSA_PADDING)
     ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING);
+#endif
     ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG);
     ossl_ssl_def_const(OP_TLS_D5_BUG);
     ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG);
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 44709)
+++ ruby_2_1/version.h	(revision 44710)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
-#define RUBY_RELEASE_DATE "2014-01-23"
-#define RUBY_PATCHLEVEL 8
+#define RUBY_RELEASE_DATE "2014-01-27"
+#define RUBY_PATCHLEVEL 9
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44402


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