Use released version of net-http-0.8.0

9 files changed, 219 insertions, 69 deletions

diff --git a/lib/rubygems/vendor/net-http/lib/net/http.rb b/lib/rubygems/vendor/net-http/lib/net/http.rb
index 0e86056614..438f2977c9 100644
--- a/lib/rubygems/vendor/net-http/lib/net/http.rb
+++ b/lib/rubygems/vendor/net-http/lib/net/http.rb
@@ -102,14 +102,14 @@ module Gem::Net   #:nodoc:
   #
   # == URIs
   #
-  # On the internet, a URI
+  # On the internet, a Gem::URI
   # ({Universal Resource Identifier}[https://en.wikipedia.org/wiki/Uniform_Resource_Identifier])
   # is a string that identifies a particular resource.
   # It consists of some or all of: scheme, hostname, path, query, and fragment;
-  # see {URI syntax}[https://en.wikipedia.org/wiki/Uniform_Resource_Identifier#Syntax].
+  # see {Gem::URI syntax}[https://en.wikipedia.org/wiki/Uniform_Resource_Identifier#Syntax].
   #
-  # A Ruby {Gem::URI::Generic}[https://docs.ruby-lang.org/en/master/Gem/URI/Generic.html] object
-  # represents an internet URI.
+  # A Ruby {Gem::URI::Generic}[https://docs.ruby-lang.org/en/master/Gem::URI/Generic.html] object
+  # represents an internet Gem::URI.
   # It provides, among others, methods
   # +scheme+, +hostname+, +path+, +query+, and +fragment+.
   #
@@ -144,7 +144,7 @@ module Gem::Net   #:nodoc:
   #
   # === Queries
   #
-  # A host-specific query adds name/value pairs to the URI:
+  # A host-specific query adds name/value pairs to the Gem::URI:
   #
   #   _uri = uri.dup
   #   params = {userId: 1, completed: false}
@@ -154,7 +154,7 @@ module Gem::Net   #:nodoc:
   #
   # === Fragments
   #
-  # A {URI fragment}[https://en.wikipedia.org/wiki/URI_fragment] has no effect
+  # A {Gem::URI fragment}[https://en.wikipedia.org/wiki/URI_fragment] has no effect
   # in \Gem::Net::HTTP;
   # the same data is returned, regardless of whether a fragment is included.
   #
@@ -327,9 +327,9 @@ module Gem::Net   #:nodoc:
   #     res = http.request(req)
   #   end
   #
-  # Or if you simply want to make a GET request, you may pass in a URI
+  # Or if you simply want to make a GET request, you may pass in a Gem::URI
   # object that has an \HTTPS URL. \Gem::Net::HTTP automatically turns on TLS
-  # verification if the URI object has a 'https' :URI scheme:
+  # verification if the Gem::URI object has a 'https' Gem::URI scheme:
   #
   #   uri # => #<Gem::URI::HTTPS https://jsonplaceholder.typicode.com/>
   #   Gem::Net::HTTP.get(uri)
@@ -374,7 +374,7 @@ module Gem::Net   #:nodoc:
   #
   # When environment variable <tt>'http_proxy'</tt>
   # is set to a \Gem::URI string,
-  # the returned +http+ will have the server at that URI as its proxy;
+  # the returned +http+ will have the server at that Gem::URI as its proxy;
   # note that the \Gem::URI string must have a protocol
   # such as <tt>'http'</tt> or <tt>'https'</tt>:
   #
@@ -724,7 +724,7 @@ module Gem::Net   #:nodoc:
   class HTTP < Protocol
 
     # :stopdoc:
-    VERSION = "0.6.0"
+    VERSION = "0.8.0"
     HTTPVersion = '1.1'
     begin
       require 'zlib'
@@ -790,7 +790,7 @@ module Gem::Net   #:nodoc:
     #     "completed": false
     #   }
     #
-    # With URI object +uri+ and optional hash argument +headers+:
+    # With Gem::URI object +uri+ and optional hash argument +headers+:
     #
     #   uri = Gem::URI('https://jsonplaceholder.typicode.com/todos/1')
     #   headers = {'Content-type' => 'application/json; charset=UTF-8'}
@@ -863,7 +863,7 @@ module Gem::Net   #:nodoc:
 
     # Posts data to a host; returns a Gem::Net::HTTPResponse object.
     #
-    # Argument +url+ must be a URI;
+    # Argument +url+ must be a Gem::URI;
     # argument +data+ must be a hash:
     #
     #   _uri = uri.dup
@@ -1179,6 +1179,7 @@ module Gem::Net   #:nodoc:
       @debug_output = options[:debug_output]
       @response_body_encoding = options[:response_body_encoding]
       @ignore_eof = options[:ignore_eof]
+      @tcpsocket_supports_open_timeout = nil
 
       @proxy_from_env = false
       @proxy_uri      = nil
@@ -1321,6 +1322,9 @@ module Gem::Net   #:nodoc:
     # Sets the proxy password;
     # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
     attr_writer :proxy_pass
+
+    # Sets wheter the proxy uses SSL;
+    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
     attr_writer :proxy_use_ssl
 
     # Returns the IP address for the connection.
@@ -1529,7 +1533,7 @@ module Gem::Net   #:nodoc:
       :verify_hostname,
     ] # :nodoc:
 
-    SSL_IVNAMES = SSL_ATTRIBUTES.map { |a| "@#{a}".to_sym } # :nodoc:
+    SSL_IVNAMES = SSL_ATTRIBUTES.map { |a| "@#{a}".to_sym }.freeze # :nodoc:
 
     # Sets or returns the path to a CA certification file in PEM format.
     attr_accessor :ca_file
@@ -1632,6 +1636,21 @@ module Gem::Net   #:nodoc:
       self
     end
 
+    # Finishes the \HTTP session:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.start
+    #   http.started? # => true
+    #   http.finish   # => nil
+    #   http.started? # => false
+    #
+    # Raises IOError if not in a session.
+    def finish
+      raise IOError, 'HTTP session not yet started' unless started?
+      do_finish
+    end
+
+    # :stopdoc:
     def do_start
       connect
       @started = true
@@ -1654,14 +1673,36 @@ module Gem::Net   #:nodoc:
       end
 
       debug "opening connection to #{conn_addr}:#{conn_port}..."
-      s = Gem::Timeout.timeout(@open_timeout, Gem::Net::OpenTimeout) {
-        begin
-          TCPSocket.open(conn_addr, conn_port, @local_host, @local_port)
-        rescue => e
-          raise e, "Failed to open TCP connection to " +
-            "#{conn_addr}:#{conn_port} (#{e.message})"
-        end
-      }
+      begin
+        s =
+          case @tcpsocket_supports_open_timeout
+          when nil, true
+            begin
+              # Use built-in timeout in TCPSocket.open if available
+              sock = TCPSocket.open(conn_addr, conn_port, @local_host, @local_port, open_timeout: @open_timeout)
+              @tcpsocket_supports_open_timeout = true
+              sock
+            rescue ArgumentError => e
+              raise if !(e.message.include?('unknown keyword: :open_timeout') || e.message.include?('wrong number of arguments (given 5, expected 2..4)'))
+              @tcpsocket_supports_open_timeout = false
+
+              # Fallback to Gem::Timeout.timeout if TCPSocket.open does not support open_timeout
+              Gem::Timeout.timeout(@open_timeout, Gem::Net::OpenTimeout) {
+                TCPSocket.open(conn_addr, conn_port, @local_host, @local_port)
+              }
+            end
+          when false
+            # The current Ruby is known to not support TCPSocket(open_timeout:).
+            # Directly fall back to Gem::Timeout.timeout to avoid performance penalty incured by rescue.
+            Gem::Timeout.timeout(@open_timeout, Gem::Net::OpenTimeout) {
+              TCPSocket.open(conn_addr, conn_port, @local_host, @local_port)
+            }
+          end
+      rescue => e
+        e = Gem::Net::OpenTimeout.new(e) if e.is_a?(Errno::ETIMEDOUT) # for compatibility with previous versions
+        raise e, "Failed to open TCP connection to " +
+          "#{conn_addr}:#{conn_port} (#{e.message})"
+      end
       s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       debug "opened"
       if use_ssl?
@@ -1758,20 +1799,6 @@ module Gem::Net   #:nodoc:
     end
     private :on_connect
 
-    # Finishes the \HTTP session:
-    #
-    #   http = Gem::Net::HTTP.new(hostname)
-    #   http.start
-    #   http.started? # => true
-    #   http.finish   # => nil
-    #   http.started? # => false
-    #
-    # Raises IOError if not in a session.
-    def finish
-      raise IOError, 'HTTP session not yet started' unless started?
-      do_finish
-    end
-
     def do_finish
       @started = false
       @socket.close if @socket
@@ -1821,6 +1848,8 @@ module Gem::Net   #:nodoc:
       }
     end
 
+    # :startdoc:
+
     class << HTTP
       # Returns true if self is a class which was created by HTTP::Proxy.
       def proxy_class?
@@ -1860,7 +1889,7 @@ module Gem::Net   #:nodoc:
       @proxy_from_env
     end
 
-    # The proxy URI determined from the environment for this connection.
+    # The proxy Gem::URI determined from the environment for this connection.
     def proxy_uri # :nodoc:
       return if @proxy_uri == false
       @proxy_uri ||= Gem::URI::HTTP.new(
@@ -1915,6 +1944,7 @@ module Gem::Net   #:nodoc:
     alias proxyport proxy_port      #:nodoc: obsolete
 
     private
+    # :stopdoc:
 
     def unescape(value)
       require 'cgi/escape'
@@ -1943,6 +1973,7 @@ module Gem::Net   #:nodoc:
         path
       end
     end
+    # :startdoc:
 
     #
     # HTTP operations
@@ -2397,6 +2428,8 @@ module Gem::Net   #:nodoc:
       res
     end
 
+    # :stopdoc:
+
     IDEMPOTENT_METHODS_ = %w/GET HEAD PUT DELETE OPTIONS TRACE/ # :nodoc:
 
     def transport_request(req)
@@ -2554,7 +2587,7 @@ module Gem::Net   #:nodoc:
     alias_method :D, :debug
   end
 
-  # for backward compatibility until Ruby 3.5
+  # for backward compatibility until Ruby 4.0
   # https://bugs.ruby-lang.org/issues/20900
   # https://github.com/bblimke/webmock/pull/1081
   HTTPSession = HTTP
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb b/lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb
index c629c0113b..218df9a8bd 100644
--- a/lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb
+++ b/lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb
@@ -3,7 +3,7 @@ module Gem::Net
   # Gem::Net::HTTP exception class.
   # You cannot use Gem::Net::HTTPExceptions directly; instead, you must use
   # its subclasses.
-  module HTTPExceptions
+  module HTTPExceptions # :nodoc:
     def initialize(msg, res)   #:nodoc:
       super msg
       @response = res
@@ -12,6 +12,7 @@ module Gem::Net
     alias data response    #:nodoc: obsolete
   end
 
+  # :stopdoc:
   class HTTPError < ProtocolError
     include HTTPExceptions
   end
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb b/lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb
index 5cfe75a7cd..d6496d4ac1 100644
--- a/lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb
+++ b/lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb
@@ -19,16 +19,13 @@ class Gem::Net::HTTPGenericRequest
 
     if Gem::URI === uri_or_path then
       raise ArgumentError, "not an HTTP Gem::URI" unless Gem::URI::HTTP === uri_or_path
-      hostname = uri_or_path.hostname
+      hostname = uri_or_path.host
       raise ArgumentError, "no host component for Gem::URI" unless (hostname && hostname.length > 0)
       @uri = uri_or_path.dup
-      host = @uri.hostname.dup
-      host << ":" << @uri.port.to_s if @uri.port != @uri.default_port
       @path = uri_or_path.request_uri
       raise ArgumentError, "no HTTP request path given" unless @path
     else
       @uri = nil
-      host = nil
       raise ArgumentError, "no HTTP request path given" unless uri_or_path
       raise ArgumentError, "HTTP request path is empty" if uri_or_path.empty?
       @path = uri_or_path.dup
@@ -51,7 +48,7 @@ class Gem::Net::HTTPGenericRequest
     initialize_http_header initheader
     self['Accept'] ||= '*/*'
     self['User-Agent'] ||= 'Ruby'
-    self['Host'] ||= host if host
+    self['Host'] ||= @uri.authority if @uri
     @body = nil
     @body_stream = nil
     @body_data = nil
@@ -102,6 +99,31 @@ class Gem::Net::HTTPGenericRequest
     "\#<#{self.class} #{@method}>"
   end
 
+  # Returns a string representation of the request with the details for pp:
+  #
+  #   require 'pp'
+  #   post = Gem::Net::HTTP::Post.new(uri)
+  #   post.inspect # => "#<Gem::Net::HTTP::Post POST>"
+  #   post.pretty_inspect
+  #   # => #<Gem::Net::HTTP::Post
+  #         POST
+  #         path="/"
+  #         headers={"accept-encoding" => ["gzip;q=1.0,deflate;q=0.6,identity;q=0.3"],
+  #          "accept" => ["*/*"],
+  #          "user-agent" => ["Ruby"],
+  #          "host" => ["www.ruby-lang.org"]}>
+  #
+  def pretty_print(q)
+    q.object_group(self) {
+      q.breakable
+      q.text @method
+      q.breakable
+      q.text "path="; q.pp @path
+      q.breakable
+      q.text "headers="; q.pp to_hash
+    }
+  end
+
   ##
   # Don't automatically decode response content-encoding if the user indicates
   # they want to handle it.
@@ -220,7 +242,7 @@ class Gem::Net::HTTPGenericRequest
     end
 
     if host = self['host']
-      host.sub!(/:.*/m, '')
+      host = Gem::URI.parse("//#{host}").host # Remove a port component from the existing Host header
     elsif host = @uri.host
     else
      host = addr
@@ -239,6 +261,8 @@ class Gem::Net::HTTPGenericRequest
 
   private
 
+  # :stopdoc:
+
   class Chunker #:nodoc:
     def initialize(sock)
       @sock = sock
@@ -260,7 +284,6 @@ class Gem::Net::HTTPGenericRequest
   def send_request_with_body(sock, ver, path, body)
     self.content_length = body.bytesize
     delete 'Transfer-Encoding'
-    supply_default_content_type
     write_header sock, ver, path
     wait_for_continue sock, ver if sock.continue_timeout
     sock.write body
@@ -271,7 +294,6 @@ class Gem::Net::HTTPGenericRequest
       raise ArgumentError,
           "Content-Length not given and Transfer-Encoding is not `chunked'"
     end
-    supply_default_content_type
     write_header sock, ver, path
     wait_for_continue sock, ver if sock.continue_timeout
     if chunked?
@@ -373,12 +395,6 @@ class Gem::Net::HTTPGenericRequest
     buf.clear
   end
 
-  def supply_default_content_type
-    return if content_type()
-    warn 'net/http: Content-Type did not set; using application/x-www-form-urlencoded', uplevel: 1 if $VERBOSE
-    set_content_type 'application/x-www-form-urlencoded'
-  end
-
   ##
   # Waits up to the continue timeout for a response from the server provided
   # we're speaking HTTP 1.1 and are expecting a 100-continue response.
@@ -411,4 +427,3 @@ class Gem::Net::HTTPGenericRequest
   end
 
 end
-
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/header.rb b/lib/rubygems/vendor/net-http/lib/net/http/header.rb
index 5cb1da01ec..bc68cd2eef 100644
--- a/lib/rubygems/vendor/net-http/lib/net/http/header.rb
+++ b/lib/rubygems/vendor/net-http/lib/net/http/header.rb
@@ -179,7 +179,9 @@
 # - #each_value: Passes each string field value to the block.
 #
 module Gem::Net::HTTPHeader
+  # The maximum length of HTTP header keys.
   MAX_KEY_LENGTH = 1024
+  # The maximum length of HTTP header values.
   MAX_FIELD_LENGTH = 65536
 
   def initialize_http_header(initheader) #:nodoc:
@@ -267,6 +269,7 @@ module Gem::Net::HTTPHeader
     end
   end
 
+  # :stopdoc:
   private def set_field(key, val)
     case val
     when Enumerable
@@ -294,6 +297,7 @@ module Gem::Net::HTTPHeader
       ary.push val
     end
   end
+  # :startdoc:
 
   # Returns the array field value for the given +key+,
   # or +nil+ if there is no such field;
@@ -490,7 +494,7 @@ module Gem::Net::HTTPHeader
 
   alias canonical_each each_capitalized
 
-  def capitalize(name)
+  def capitalize(name)  # :nodoc:
     name.to_s.split('-'.freeze).map {|s| s.capitalize }.join('-'.freeze)
   end
   private :capitalize
@@ -957,12 +961,12 @@ module Gem::Net::HTTPHeader
     @header['proxy-authorization'] = [basic_encode(account, password)]
   end
 
-  def basic_encode(account, password)
+  def basic_encode(account, password)   # :nodoc:
     'Basic ' + ["#{account}:#{password}"].pack('m0')
   end
   private :basic_encode
 
-# Returns whether the HTTP session is to be closed.
+  # Returns whether the HTTP session is to be closed.
   def connection_close?
     token = /(?:\A|,)\s*close\s*(?:\z|,)/i
     @header['connection']&.grep(token) {return true}
@@ -970,7 +974,7 @@ module Gem::Net::HTTPHeader
     false
   end
 
-# Returns whether the HTTP session is to be kept alive.
+  # Returns whether the HTTP session is to be kept alive.
   def connection_keep_alive?
     token = /(?:\A|,)\s*keep-alive\s*(?:\z|,)/i
     @header['connection']&.grep(token) {return true}
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/requests.rb b/lib/rubygems/vendor/net-http/lib/net/http/requests.rb
index 45727e7f61..f990761042 100644
--- a/lib/rubygems/vendor/net-http/lib/net/http/requests.rb
+++ b/lib/rubygems/vendor/net-http/lib/net/http/requests.rb
@@ -29,6 +29,7 @@
 # - Gem::Net::HTTP#get: sends +GET+ request, returns response object.
 #
 class Gem::Net::HTTP::Get < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'GET'
   REQUEST_HAS_BODY  = false
   RESPONSE_HAS_BODY = true
@@ -60,6 +61,7 @@ end
 # - Gem::Net::HTTP#head: sends +HEAD+ request, returns response object.
 #
 class Gem::Net::HTTP::Head < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'HEAD'
   REQUEST_HAS_BODY = false
   RESPONSE_HAS_BODY = false
@@ -95,6 +97,7 @@ end
 # - Gem::Net::HTTP#post: sends +POST+ request, returns response object.
 #
 class Gem::Net::HTTP::Post < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'POST'
   REQUEST_HAS_BODY = true
   RESPONSE_HAS_BODY = true
@@ -130,6 +133,7 @@ end
 # - Gem::Net::HTTP#put: sends +PUT+ request, returns response object.
 #
 class Gem::Net::HTTP::Put < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'PUT'
   REQUEST_HAS_BODY = true
   RESPONSE_HAS_BODY = true
@@ -162,6 +166,7 @@ end
 # - Gem::Net::HTTP#delete: sends +DELETE+ request, returns response object.
 #
 class Gem::Net::HTTP::Delete < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'DELETE'
   REQUEST_HAS_BODY = false
   RESPONSE_HAS_BODY = true
@@ -193,6 +198,7 @@ end
 # - Gem::Net::HTTP#options: sends +OPTIONS+ request, returns response object.
 #
 class Gem::Net::HTTP::Options < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'OPTIONS'
   REQUEST_HAS_BODY = false
   RESPONSE_HAS_BODY = true
@@ -224,6 +230,7 @@ end
 # - Gem::Net::HTTP#trace: sends +TRACE+ request, returns response object.
 #
 class Gem::Net::HTTP::Trace < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'TRACE'
   REQUEST_HAS_BODY = false
   RESPONSE_HAS_BODY = true
@@ -258,6 +265,7 @@ end
 # - Gem::Net::HTTP#patch: sends +PATCH+ request, returns response object.
 #
 class Gem::Net::HTTP::Patch < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'PATCH'
   REQUEST_HAS_BODY = true
   RESPONSE_HAS_BODY = true
@@ -285,6 +293,7 @@ end
 # - Gem::Net::HTTP#propfind: sends +PROPFIND+ request, returns response object.
 #
 class Gem::Net::HTTP::Propfind < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'PROPFIND'
   REQUEST_HAS_BODY = true
   RESPONSE_HAS_BODY = true
@@ -308,6 +317,7 @@ end
 # - Gem::Net::HTTP#proppatch: sends +PROPPATCH+ request, returns response object.
 #
 class Gem::Net::HTTP::Proppatch < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'PROPPATCH'
   REQUEST_HAS_BODY = true
   RESPONSE_HAS_BODY = true
@@ -331,6 +341,7 @@ end
 # - Gem::Net::HTTP#mkcol: sends +MKCOL+ request, returns response object.
 #
 class Gem::Net::HTTP::Mkcol < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'MKCOL'
   REQUEST_HAS_BODY = true
   RESPONSE_HAS_BODY = true
@@ -354,6 +365,7 @@ end
 # - Gem::Net::HTTP#copy: sends +COPY+ request, returns response object.
 #
 class Gem::Net::HTTP::Copy < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'COPY'
   REQUEST_HAS_BODY = false
   RESPONSE_HAS_BODY = true
@@ -377,6 +389,7 @@ end
 # - Gem::Net::HTTP#move: sends +MOVE+ request, returns response object.
 #
 class Gem::Net::HTTP::Move < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'MOVE'
   REQUEST_HAS_BODY = false
   RESPONSE_HAS_BODY = true
@@ -400,6 +413,7 @@ end
 # - Gem::Net::HTTP#lock: sends +LOCK+ request, returns response object.
 #
 class Gem::Net::HTTP::Lock < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'LOCK'
   REQUEST_HAS_BODY = true
   RESPONSE_HAS_BODY = true
@@ -423,8 +437,8 @@ end
 # - Gem::Net::HTTP#unlock: sends +UNLOCK+ request, returns response object.
 #
 class Gem::Net::HTTP::Unlock < Gem::Net::HTTPRequest
+  # :stopdoc:
   METHOD = 'UNLOCK'
   REQUEST_HAS_BODY = true
   RESPONSE_HAS_BODY = true
 end
-
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/response.rb b/lib/rubygems/vendor/net-http/lib/net/http/response.rb
index cbbd191d87..dc164f1504 100644
--- a/lib/rubygems/vendor/net-http/lib/net/http/response.rb
+++ b/lib/rubygems/vendor/net-http/lib/net/http/response.rb
@@ -153,6 +153,7 @@ class Gem::Net::HTTPResponse
     end
 
     private
+    # :stopdoc:
 
     def read_status_line(sock)
       str = sock.readline
@@ -259,7 +260,7 @@ class Gem::Net::HTTPResponse
   # header.
   attr_accessor :ignore_eof
 
-  def inspect
+  def inspect   # :nodoc:
     "#<#{self.class} #{@code} #{@message} readbody=#{@read}>"
   end
 
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/responses.rb b/lib/rubygems/vendor/net-http/lib/net/http/responses.rb
index 0f26ae6c26..62ce1cba1b 100644
--- a/lib/rubygems/vendor/net-http/lib/net/http/responses.rb
+++ b/lib/rubygems/vendor/net-http/lib/net/http/responses.rb
@@ -4,7 +4,9 @@
 
 module Gem::Net
 
+  # Unknown HTTP response
   class HTTPUnknownResponse < HTTPResponse
+    # :stopdoc:
     HAS_BODY = true
     EXCEPTION_TYPE = HTTPError                  #
   end
@@ -19,6 +21,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#1xx_informational_response].
   #
   class HTTPInformation < HTTPResponse
+    # :stopdoc:
     HAS_BODY = false
     EXCEPTION_TYPE = HTTPError                  #
   end
@@ -34,6 +37,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#2xx_success].
   #
   class HTTPSuccess < HTTPResponse
+    # :stopdoc:
     HAS_BODY = true
     EXCEPTION_TYPE = HTTPError                  #
   end
@@ -49,6 +53,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#3xx_redirection].
   #
   class HTTPRedirection < HTTPResponse
+    # :stopdoc:
     HAS_BODY = true
     EXCEPTION_TYPE = HTTPRetriableError         #
   end
@@ -63,6 +68,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#4xx_client_errors].
   #
   class HTTPClientError < HTTPResponse
+    # :stopdoc:
     HAS_BODY = true
     EXCEPTION_TYPE = HTTPClientException        #
   end
@@ -77,6 +83,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#5xx_server_errors].
   #
   class HTTPServerError < HTTPResponse
+    # :stopdoc:
     HAS_BODY = true
     EXCEPTION_TYPE = HTTPFatalError             #
   end
@@ -94,6 +101,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#100].
   #
   class HTTPContinue < HTTPInformation
+    # :stopdoc:
     HAS_BODY = false
   end
 
@@ -111,6 +119,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#101].
   #
   class HTTPSwitchProtocol < HTTPInformation
+    # :stopdoc:
     HAS_BODY = false
   end
 
@@ -127,6 +136,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#102].
   #
   class HTTPProcessing < HTTPInformation
+    # :stopdoc:
     HAS_BODY = false
   end
 
@@ -145,6 +155,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#103].
   #
   class HTTPEarlyHints < HTTPInformation
+    # :stopdoc:
     HAS_BODY = false
   end
 
@@ -162,6 +173,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#200].
   #
   class HTTPOK < HTTPSuccess
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -179,6 +191,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#201].
   #
   class HTTPCreated < HTTPSuccess
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -196,6 +209,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#202].
   #
   class HTTPAccepted < HTTPSuccess
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -215,6 +229,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#203].
   #
   class HTTPNonAuthoritativeInformation < HTTPSuccess
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -232,6 +247,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#204].
   #
   class HTTPNoContent < HTTPSuccess
+    # :stopdoc:
     HAS_BODY = false
   end
 
@@ -250,6 +266,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#205].
   #
   class HTTPResetContent < HTTPSuccess
+    # :stopdoc:
     HAS_BODY = false
   end
 
@@ -268,6 +285,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#206].
   #
   class HTTPPartialContent < HTTPSuccess
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -285,6 +303,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#207].
   #
   class HTTPMultiStatus < HTTPSuccess
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -304,6 +323,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#208].
   #
   class HTTPAlreadyReported < HTTPSuccess
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -321,6 +341,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#226].
   #
   class HTTPIMUsed < HTTPSuccess
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -338,6 +359,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#300].
   #
   class HTTPMultipleChoices < HTTPRedirection
+    # :stopdoc:
     HAS_BODY = true
   end
   HTTPMultipleChoice = HTTPMultipleChoices
@@ -356,6 +378,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#301].
   #
   class HTTPMovedPermanently < HTTPRedirection
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -373,6 +396,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#302].
   #
   class HTTPFound < HTTPRedirection
+    # :stopdoc:
     HAS_BODY = true
   end
   HTTPMovedTemporarily = HTTPFound
@@ -390,6 +414,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#303].
   #
   class HTTPSeeOther < HTTPRedirection
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -407,6 +432,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#304].
   #
   class HTTPNotModified < HTTPRedirection
+    # :stopdoc:
     HAS_BODY = false
   end
 
@@ -423,6 +449,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#305].
   #
   class HTTPUseProxy < HTTPRedirection
+    # :stopdoc:
     HAS_BODY = false
   end
 
@@ -440,6 +467,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#307].
   #
   class HTTPTemporaryRedirect < HTTPRedirection
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -456,6 +484,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#308].
   #
   class HTTPPermanentRedirect < HTTPRedirection
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -472,6 +501,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#400].
   #
   class HTTPBadRequest < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -488,6 +518,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#401].
   #
   class HTTPUnauthorized < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -504,6 +535,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#402].
   #
   class HTTPPaymentRequired < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -521,6 +553,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#403].
   #
   class HTTPForbidden < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -537,6 +570,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#404].
   #
   class HTTPNotFound < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -553,6 +587,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#405].
   #
   class HTTPMethodNotAllowed < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -570,6 +605,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#406].
   #
   class HTTPNotAcceptable < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -586,6 +622,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#407].
   #
   class HTTPProxyAuthenticationRequired < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -602,6 +639,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#408].
   #
   class HTTPRequestTimeout < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
   HTTPRequestTimeOut = HTTPRequestTimeout
@@ -619,6 +657,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#409].
   #
   class HTTPConflict < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -636,6 +675,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#410].
   #
   class HTTPGone < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -653,6 +693,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#411].
   #
   class HTTPLengthRequired < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -670,6 +711,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#412].
   #
   class HTTPPreconditionFailed < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -686,6 +728,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#413].
   #
   class HTTPPayloadTooLarge < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
   HTTPRequestEntityTooLarge = HTTPPayloadTooLarge
@@ -703,6 +746,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#414].
   #
   class HTTPURITooLong < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
   HTTPRequestURITooLong = HTTPURITooLong
@@ -721,6 +765,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#415].
   #
   class HTTPUnsupportedMediaType < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -737,6 +782,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#416].
   #
   class HTTPRangeNotSatisfiable < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
   HTTPRequestedRangeNotSatisfiable = HTTPRangeNotSatisfiable
@@ -754,6 +800,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#417].
   #
   class HTTPExpectationFailed < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -774,6 +821,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#421].
   #
   class HTTPMisdirectedRequest < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -790,6 +838,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#422].
   #
   class HTTPUnprocessableEntity < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -805,6 +854,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#423].
   #
   class HTTPLocked < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -821,6 +871,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#424].
   #
   class HTTPFailedDependency < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -840,6 +891,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#426].
   #
   class HTTPUpgradeRequired < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -856,6 +908,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#428].
   #
   class HTTPPreconditionRequired < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -872,6 +925,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#429].
   #
   class HTTPTooManyRequests < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -889,6 +943,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#431].
   #
   class HTTPRequestHeaderFieldsTooLarge < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -906,6 +961,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#451].
   #
   class HTTPUnavailableForLegalReasons < HTTPClientError
+    # :stopdoc:
     HAS_BODY = true
   end
   # 444 No Response - Nginx
@@ -926,6 +982,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#500].
   #
   class HTTPInternalServerError < HTTPServerError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -943,6 +1000,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#501].
   #
   class HTTPNotImplemented < HTTPServerError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -960,6 +1018,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#502].
   #
   class HTTPBadGateway < HTTPServerError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -977,6 +1036,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#503].
   #
   class HTTPServiceUnavailable < HTTPServerError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -994,6 +1054,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#504].
   #
   class HTTPGatewayTimeout < HTTPServerError
+    # :stopdoc:
     HAS_BODY = true
   end
   HTTPGatewayTimeOut = HTTPGatewayTimeout
@@ -1011,6 +1072,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#505].
   #
   class HTTPVersionNotSupported < HTTPServerError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -1027,6 +1089,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#506].
   #
   class HTTPVariantAlsoNegotiates < HTTPServerError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -1043,6 +1106,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#507].
   #
   class HTTPInsufficientStorage < HTTPServerError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -1059,6 +1123,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#508].
   #
   class HTTPLoopDetected < HTTPServerError
+    # :stopdoc:
     HAS_BODY = true
   end
   # 509 Bandwidth Limit Exceeded - Apache bw/limited extension
@@ -1076,6 +1141,7 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#510].
   #
   class HTTPNotExtended < HTTPServerError
+    # :stopdoc:
     HAS_BODY = true
   end
 
@@ -1092,19 +1158,21 @@ module Gem::Net
   # - {Wikipedia}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#511].
   #
   class HTTPNetworkAuthenticationRequired < HTTPServerError
+    # :stopdoc:
     HAS_BODY = true
   end
 
 end
 
 class Gem::Net::HTTPResponse
+  # :stopdoc:
   CODE_CLASS_TO_OBJ = {
     '1' => Gem::Net::HTTPInformation,
     '2' => Gem::Net::HTTPSuccess,
     '3' => Gem::Net::HTTPRedirection,
     '4' => Gem::Net::HTTPClientError,
     '5' => Gem::Net::HTTPServerError
-  }
+  }.freeze
   CODE_TO_OBJ = {
     '100' => Gem::Net::HTTPContinue,
     '101' => Gem::Net::HTTPSwitchProtocol,
@@ -1170,5 +1238,5 @@ class Gem::Net::HTTPResponse
     '508' => Gem::Net::HTTPLoopDetected,
     '510' => Gem::Net::HTTPNotExtended,
     '511' => Gem::Net::HTTPNetworkAuthenticationRequired,
-  }
+  }.freeze
 end
diff --git a/tool/bundler/vendor_gems.rb b/tool/bundler/vendor_gems.rb
index 72546faf31..dd1325e84e 100644
--- a/tool/bundler/vendor_gems.rb
+++ b/tool/bundler/vendor_gems.rb
@@ -4,8 +4,13 @@ source "https://rubygems.org"
 
 gem "fileutils", "1.7.3"
 gem "molinillo", github: "cocoapods/molinillo"
+<<<<<<< HEAD
 gem "net-http", github: "ruby/net-http", ref: "d8fd39c589279b1aaec85a7c8de9b3e199c72efe"
 gem "net-http-persistent", github: "hsbt/net-http-persistent", ref: "9b6fbd733cf35596dfe7f80c0c154f9f3d17dbdb"
+=======
+gem "net-http", "0.8.0"
+gem "net-http-persistent", "4.0.6"
+>>>>>>> 7e6ce7be57a (Use released version of net-http-0.8.0)
 gem "net-protocol", "0.2.2"
 gem "optparse", "0.6.0"
 gem "pub_grub", github: "jhawthorn/pub_grub", ref: "df6add45d1b4d122daff2f959c9bd1ca93d14261"
diff --git a/tool/bundler/vendor_gems.rb.lock b/tool/bundler/vendor_gems.rb.lock
index b1a2351e94..3221b53e58 100644
--- a/tool/bundler/vendor_gems.rb.lock
+++ b/tool/bundler/vendor_gems.rb.lock
@@ -19,19 +19,18 @@ GIT
   specs:
     pub_grub (0.5.0)
 
-GIT
-  remote: https://github.com/ruby/net-http.git
-  revision: d8fd39c589279b1aaec85a7c8de9b3e199c72efe
-  ref: d8fd39c589279b1aaec85a7c8de9b3e199c72efe
-  specs:
-    net-http (0.6.0)
-      uri
-
 GEM
   remote: https://rubygems.org/
   specs:
     connection_pool (2.4.1)
     fileutils (1.7.3)
+<<<<<<< HEAD
+=======
+    net-http (0.8.0)
+      uri (>= 0.11.1)
+    net-http-persistent (4.0.6)
+      connection_pool (~> 2.2, >= 2.2.4)
+>>>>>>> 7e6ce7be57a (Use released version of net-http-0.8.0)
     net-protocol (0.2.2)
       timeout
     optparse (0.6.0)
@@ -54,8 +53,13 @@ PLATFORMS
 DEPENDENCIES
   fileutils (= 1.7.3)
   molinillo!
+<<<<<<< HEAD
   net-http!
   net-http-persistent!
+=======
+  net-http (= 0.8.0)
+  net-http-persistent (= 4.0.6)
+>>>>>>> 7e6ce7be57a (Use released version of net-http-0.8.0)
   net-protocol (= 0.2.2)
   optparse (= 0.6.0)
   pub_grub!
@@ -70,8 +74,13 @@ CHECKSUMS
   connection_pool (2.4.1) sha256=0f40cf997091f1f04ff66da67eabd61a9fe0d4928b9a3645228532512fab62f4
   fileutils (1.7.3) sha256=57271e854b694a87755d76f836f5c57b2c9538ebbaf4b2154bb66addf15eb5da
   molinillo (0.8.0)
+<<<<<<< HEAD
   net-http (0.6.0)
   net-http-persistent (4.0.6)
+=======
+  net-http (0.8.0) sha256=df42c47ce9f9e95ad32a317c97c12f945bc1af365288837ea4ff259876ecb46d
+  net-http-persistent (4.0.6) sha256=2abb3a04438edf6cb9e0e7e505969605f709eda3e3c5211beadd621a2c84dd5d
+>>>>>>> 7e6ce7be57a (Use released version of net-http-0.8.0)
   net-protocol (0.2.2) sha256=aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8
   optparse (0.6.0) sha256=25e90469c1cd44048a89dc01c1dde9d5f0bdf717851055fb18237780779b068c
   pub_grub (0.5.0)