mvadkert / rpms / ruby

Forked from rpms/ruby 6 years ago
Clone
1bc9eed
diff -ruN ruby-1.8.6-p110.orig/ext/openssl/lib/openssl/ssl.rb ruby-1.8.6-p110/ext/openssl/lib/openssl/ssl.rb
1bc9eed
--- ruby-1.8.6-p110.orig/ext/openssl/lib/openssl/ssl.rb	2007-02-13 08:01:19.000000000 +0900
1bc9eed
+++ ruby-1.8.6-p110/ext/openssl/lib/openssl/ssl.rb	2007-10-04 22:38:48.000000000 +0900
1bc9eed
@@ -88,7 +88,7 @@
1bc9eed
             end
1bc9eed
           }
1bc9eed
         end
1bc9eed
-        raise SSLError, "hostname not match"
1bc9eed
+        raise SSLError, "hostname not match with the server certificate"
1bc9eed
       end
1bc9eed
     end
1bc9eed
 
1bc9eed
diff -ruN ruby-1.8.6-p110.orig/lib/net/http.rb ruby-1.8.6-p110/lib/net/http.rb
1bc9eed
--- ruby-1.8.6-p110.orig/lib/net/http.rb	2007-02-13 08:01:19.000000000 +0900
1bc9eed
+++ ruby-1.8.6-p110/lib/net/http.rb	2007-10-04 22:41:34.000000000 +0900
1bc9eed
@@ -470,6 +470,7 @@
1bc9eed
       @debug_output = nil
1bc9eed
       @use_ssl = false
1bc9eed
       @ssl_context = nil
1bc9eed
+      @enable_post_connection_check = true
1bc9eed
     end
1bc9eed
 
1bc9eed
     def inspect
1bc9eed
@@ -526,6 +527,9 @@
1bc9eed
       false   # redefined in net/https
1bc9eed
     end
1bc9eed
 
1bc9eed
+    # specify enabling SSL server certificate and hostname checking.
1bc9eed
+    attr_accessor :enable_post_connection_check
1bc9eed
+
1bc9eed
     # Opens TCP connection and HTTP session.
1bc9eed
     # 
1bc9eed
     # When this method is called with block, gives a HTTP object
1bc9eed
@@ -584,6 +588,14 @@
1bc9eed
           HTTPResponse.read_new(@socket).value
1bc9eed
         end
1bc9eed
         s.connect
1bc9eed
+        if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
1bc9eed
+          begin
1bc9eed
+           s.post_connection_check(@address)
1bc9eed
+          rescue OpenSSL::SSL::SSLError => ex
1bc9eed
+           raise ex if @enable_post_connection_check
1bc9eed
+           warn ex.message
1bc9eed
+          end
1bc9eed
+        end
1bc9eed
       end
1bc9eed
       on_connect
1bc9eed
     end
1bc9eed
diff -ruN ruby-1.8.6-p110.orig/lib/open-uri.rb ruby-1.8.6-p110/lib/open-uri.rb
1bc9eed
--- ruby-1.8.6-p110.orig/lib/open-uri.rb	2007-02-13 08:01:19.000000000 +0900
1bc9eed
+++ ruby-1.8.6-p110/lib/open-uri.rb	2007-10-04 22:42:18.000000000 +0900
1bc9eed
@@ -229,6 +229,7 @@
1bc9eed
     if target.class == URI::HTTPS
1bc9eed
       require 'net/https'
1bc9eed
       http.use_ssl = true
1bc9eed
+      http.enable_post_connection_check = true
1bc9eed
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
1bc9eed
       store = OpenSSL::X509::Store.new
1bc9eed
       store.set_default_paths
1bc9eed
@@ -240,16 +241,6 @@
1bc9eed
 
1bc9eed
     resp = nil
1bc9eed
     http.start {
1bc9eed
-      if target.class == URI::HTTPS
1bc9eed
-        # xxx: information hiding violation
1bc9eed
-        sock = http.instance_variable_get(:@socket)
1bc9eed
-        if sock.respond_to?(:io)
1bc9eed
-          sock = sock.io # 1.9
1bc9eed
-        else
1bc9eed
-          sock = sock.instance_variable_get(:@socket) # 1.8
1bc9eed
-        end
1bc9eed
-        sock.post_connection_check(target_host)
1bc9eed
-      end
1bc9eed
       req = Net::HTTP::Get.new(request_uri, header)
1bc9eed
       if options.include? :http_basic_authentication
1bc9eed
         user, pass = options[:http_basic_authentication]
1bc9eed
diff -ruN ruby-1.8.6-p110.orig/version.h ruby-1.8.6-p110/version.h
1bc9eed
--- ruby-1.8.6-p110.orig/version.h	2007-09-23 09:01:50.000000000 +0900
1bc9eed
+++ ruby-1.8.6-p110/version.h	2007-10-04 22:42:37.000000000 +0900
1bc9eed
@@ -1,15 +1,15 @@
1bc9eed
 #define RUBY_VERSION "1.8.6"
1bc9eed
-#define RUBY_RELEASE_DATE "2007-09-23"
1bc9eed
+#define RUBY_RELEASE_DATE "2007-09-24"
1bc9eed
 #define RUBY_VERSION_CODE 186
1bc9eed
-#define RUBY_RELEASE_CODE 20070923
1bc9eed
-#define RUBY_PATCHLEVEL 110
1bc9eed
+#define RUBY_RELEASE_CODE 20070924
1bc9eed
+#define RUBY_PATCHLEVEL 111
1bc9eed
 
1bc9eed
 #define RUBY_VERSION_MAJOR 1
1bc9eed
 #define RUBY_VERSION_MINOR 8
1bc9eed
 #define RUBY_VERSION_TEENY 6
1bc9eed
 #define RUBY_RELEASE_YEAR 2007
1bc9eed
 #define RUBY_RELEASE_MONTH 9
1bc9eed
-#define RUBY_RELEASE_DAY 23
1bc9eed
+#define RUBY_RELEASE_DAY 24
1bc9eed
 
1bc9eed
 #ifdef RUBY_EXTERN
1bc9eed
 RUBY_EXTERN const char ruby_version[];