From a52143c63c771db1ce4eaee23022696b4519be03 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Thu, 1 Jan 2015 01:21:59 -0500
Subject: Remove readline and zlib hacks

---
 Library/Homebrew/utils.rb | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to 'Library/Homebrew/utils.rb')

diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index f8085ac8f..16b228432 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -314,7 +314,7 @@ module GitHub extend self
     # This is a no-op if the user is opting out of using the GitHub API.
     return if ENV['HOMEBREW_NO_GITHUB_API']
 
-    safely_load_net_https
+    require "net/https"
 
     default_headers = {
       "User-Agent" => HOMEBREW_USER_AGENT,
@@ -411,24 +411,4 @@ module GitHub extend self
     uri = URI.parse("https://api.github.com/repos/#{user}/#{repo}")
     open(uri) { |json| json["private"] }
   end
-
-  private
-
-  # If the zlib formula is loaded, TypeError will be raised when we try to load
-  # net/https. This monkeypatch prevents that and lets Net::HTTP fall back to
-  # the non-gzip codepath.
-  def safely_load_net_https
-    return if defined?(Net::HTTP)
-    if defined?(Zlib) && RUBY_VERSION >= "1.9"
-      require "net/protocol"
-      http = Class.new(Net::Protocol) do
-        def self.require(lib)
-          raise LoadError if lib == "zlib"
-          super
-        end
-      end
-      Net.const_set(:HTTP, http)
-    end
-    require "net/https"
-  end
 end
-- 
cgit v1.2.3