From 51e25545aeb1555051b95c5b31b4f3ca6ec6b6fe Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 11 Sep 2005 14:26:27 +0000
Subject: [PATCH] * lib/net/imap.rb (starttls): supported the STARTTLS command.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       |  4 ++++
 lib/net/imap.rb | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ad75ee7be0..6737cf86f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep 11 23:23:02 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (starttls): supported the STARTTLS command.
+
 Sun Sep 11 22:18:07 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* bin/erb (ERB::Main#run): set ERB#filename so that it is used
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 82d5b29738..a5c1433714 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -322,6 +322,24 @@ module Net
       send_command("LOGOUT")
     end
 
+    # Sends a STARTTLS command to start TLS session.
+    def starttls(ctx = nil)
+      if @sock.kind_of?(OpenSSL::SSL::SSLSocket)
+        raise RuntimeError, "already using SSL"
+      end
+      send_command("STARTTLS") do |resp|
+        if resp.kind_of?(TaggedResponse) && resp.name == "OK"
+          if ctx
+            @sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
+          else
+            @sock = OpenSSL::SSL::SSLSocket.new(@sock)
+          end
+          @sock.sync_close = true
+          @sock.connect
+        end
+      end
+    end
+
     # Sends an AUTHENTICATE command to authenticate the client.
     # The +auth_type+ parameter is a string that represents
     # the authentication mechanism to be used. Currently Net::IMAP