Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

* lib/rubygems: Updated to RubyGems 1.8.24, a bugfix release.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 505c4eae3220b3af74c91d8b6af0c3f2480fb85e 1 parent c4348fc
Eric Hodel drbrain authored
4 ChangeLog
... ... @@ -1,3 +1,7 @@
  1 +Tue Jul 24 09:31:18 2012 Eric Hodel <drbrain@segment7.net>
  2 +
  3 + * lib/rubygems: Updated to RubyGems 1.8.24, a bugfix release.
  4 +
1 5 Tue Jul 24 08:30:15 2012 Luis Lavena <luislavena@gmail.com>
2 6
3 7 * test/ruby/test_dir_m17n.rb (create_and_check_raw_file_name): add new
2  lib/rubygems.rb
@@ -121,7 +121,7 @@ class << Gem
121 121 # -The RubyGems Team
122 122
123 123 module Gem
124   - VERSION = '1.8.23'
  124 + VERSION = '1.8.24'
125 125
126 126 ##
127 127 # Raised when RubyGems is unable to load or activate a gem. Contains the
5 lib/rubygems/commands/setup_command.rb
@@ -209,7 +209,10 @@ def install_lib(lib_dir)
209 209 say "Installing RubyGems" if @verbose
210 210
211 211 Dir.chdir 'lib' do
212   - lib_files = Dir[File.join('**', '*rb')]
  212 + lib_files = Dir[File.join('**', '*rb')]
  213 +
  214 + # Be sure to include our SSL ca bundles
  215 + lib_files += Dir[File.join('**', '*pem')]
213 216
214 217 lib_files.each do |lib_file|
215 218 dest_file = File.join lib_dir, lib_file
19 lib/rubygems/remote_fetcher.rb
@@ -321,13 +321,24 @@ def connection_for(uri)
321 321
322 322 if https?(uri) and !connection.started? then
323 323 configure_connection_for_https(connection)
324   - end
325 324
326   - connection.start unless connection.started?
  325 + # Don't refactor this with the else branch. We don't want the
  326 + # http-only code path to not depend on anything in OpenSSL.
  327 + #
  328 + begin
  329 + connection.start
  330 + rescue OpenSSL::SSL::SSLError, Errno::EHOSTDOWN => e
  331 + raise FetchError.new(e.message, uri)
  332 + end
  333 + else
  334 + begin
  335 + connection.start unless connection.started?
  336 + rescue Errno::EHOSTDOWN => e
  337 + raise FetchError.new(e.message, uri)
  338 + end
  339 + end
327 340
328 341 connection
329   - rescue OpenSSL::SSL::SSLError, Errno::EHOSTDOWN => e
330   - raise FetchError.new(e.message, uri)
331 342 end
332 343
333 344 def configure_connection_for_https(connection)

0 comments on commit 505c4ea

Please sign in to comment.
Something went wrong with that request. Please try again.