From e68c8979255e4f562b16994e04520f06312c5f96 Mon Sep 17 00:00:00 2001 From: nahi Date: Mon, 25 Jul 2011 06:38:44 +0000 Subject: * ext/openssl/lib/openssl/{x509.rb,ssl.rb}: Add deprecation warning for openssl/{x509,ssl} usage. Users should require "openssl" instead of "openssl/ssl" and "openssl/x509". Start of transition period introduced by [ruby-dev:38018]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/lib/openssl.rb | 1 - ext/openssl/lib/openssl/ssl.rb | 1 + ext/openssl/lib/openssl/x509.rb | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) (limited to 'ext/openssl') diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb index fb215cdc56..3cff8d9c10 100644 --- a/ext/openssl/lib/openssl.rb +++ b/ext/openssl/lib/openssl.rb @@ -20,7 +20,6 @@ require 'openssl/bn' require 'openssl/cipher' require 'openssl/config' require 'openssl/digest' -require 'openssl/x509' require 'openssl/ssl-internal' require 'openssl/x509-internal' diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb index 3f17f5aa29..15f42d6091 100644 --- a/ext/openssl/lib/openssl/ssl.rb +++ b/ext/openssl/lib/openssl/ssl.rb @@ -1 +1,2 @@ +warn 'deprecated openssl/ssl use: require "openssl" instead of "openssl/ssl"' require 'openssl' diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb index 3f17f5aa29..f1777cdf06 100644 --- a/ext/openssl/lib/openssl/x509.rb +++ b/ext/openssl/lib/openssl/x509.rb @@ -1 +1,2 @@ +warn 'deprecated openssl/x509 use: require "openssl" instead of "openssl/x509"' require 'openssl' -- cgit v1.2.3