From e04e2e0bb33e48f556037d786db60ac2059b2af9 Mon Sep 17 00:00:00 2001 From: kazu Date: Tue, 15 Apr 2008 09:41:47 +0000 Subject: * lib/uri.rb, lib/uri/ldaps.rb: added LDAPS scheme; backported from 1.9. bug#19015, [ruby-dev:31896] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ NEWS | 4 ++++ lib/uri.rb | 1 + lib/uri/ldaps.rb | 12 ++++++++++++ 4 files changed, 22 insertions(+) create mode 100644 lib/uri/ldaps.rb diff --git a/ChangeLog b/ChangeLog index a68924065c..dd7c132631 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Apr 15 18:39:14 2008 Kazuhiro NISHIYAMA + + * lib/uri.rb, lib/uri/ldaps.rb: added LDAPS + scheme; backported from 1.9. bug#19015, [ruby-dev:31896] + Tue Apr 15 17:45:43 2008 Kazuhiro NISHIYAMA * lib/net/smtp.rb: backported from 1.9. bug#19003 diff --git a/NEWS b/NEWS index c63d31818d..6ebec2d2c5 100644 --- a/NEWS +++ b/NEWS @@ -284,6 +284,10 @@ with all sufficient information, see the ChangeLog file. Tempfile.open(['image', 'jpg']) { |tempfile| ... } +* uri + + * added LDAPS scheme. + * rss * 0.1.6 -> 0.2.4 diff --git a/lib/uri.rb b/lib/uri.rb index 09c4f5fbcf..f7110f18fd 100644 --- a/lib/uri.rb +++ b/lib/uri.rb @@ -25,4 +25,5 @@ require 'uri/ftp' require 'uri/http' require 'uri/https' require 'uri/ldap' +require 'uri/ldaps' require 'uri/mailto' diff --git a/lib/uri/ldaps.rb b/lib/uri/ldaps.rb new file mode 100644 index 0000000000..6da333150f --- /dev/null +++ b/lib/uri/ldaps.rb @@ -0,0 +1,12 @@ +require 'uri/ldap' + +module URI + + # The default port for LDAPS URIs is 636, and the scheme is 'ldaps:' rather + # than 'ldap:'. Other than that, LDAPS URIs are identical to LDAP URIs; + # see URI::LDAP. + class LDAPS < LDAP + DEFAULT_PORT = 636 + end + @@schemes['LDAPS'] = LDAPS +end -- cgit v1.2.3