summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--NEWS4
-rw-r--r--lib/uri.rb1
-rw-r--r--lib/uri/ldaps.rb12
4 files changed, 22 insertions, 0 deletions
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 <zn@mbf.nifty.com>
+
+ * 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 <zn@mbf.nifty.com>
* 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