naruse	2019-04-15 22:27:53 +0900 (Mon, 15 Apr 2019)

  New Revision: 67564

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=67564

  Log:
    merge revision(s) 67563:
    
    Support SNI (Reapplying r67488)
    
    This fixes connecting using TLS 1.3 to imap.gmail.com
    
    [Fix GH-2077] [Feature #15594]
    
    From: Marc-Antoine Perennou <Marc-Antoine@P...>

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/lib/net/imap.rb
    branches/ruby_2_6/version.h
Index: ruby_2_6/lib/net/imap.rb
===================================================================
--- ruby_2_6/lib/net/imap.rb	(revision 67563)
+++ ruby_2_6/lib/net/imap.rb	(revision 67564)
@@ -1530,6 +1530,7 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_6/lib/net/imap.rb#L1530
       end
       @sock = SSLSocket.new(@sock, context)
       @sock.sync_close = true
+      @sock.hostname = @host if @sock.respond_to? :hostname=
       ssl_socket_connect(@sock, @open_timeout)
       if context.verify_mode != VERIFY_NONE
         @sock.post_connection_check(@host)
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 67563)
+++ ruby_2_6/version.h	(revision 67564)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #define RUBY_VERSION "2.6.3"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 60
+#define RUBY_PATCHLEVEL 61
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 67563)
+++ ruby_2_6	(revision 67564)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r67563

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