httpclient 2.5.3.1 → 2.5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c825be1948756d9856d5cd4546538e259d9f2c50
-  data.tar.gz: e93d9f59d953cc2c4e2b11f437e0ef54fcda7942
+  metadata.gz: 2ed970a9f9a678a4e9ffc7db66c03b06c1a6ca55
+  data.tar.gz: cb2835e9852021421d95449c0551679c6533571d
 SHA512:
-  metadata.gz: b3f335e8bd447c2886ab599c8271623e636e0cc368f439ac961606e4ed71481ea9467cffed271f91f187e850cecd071872c578b3c3d4c866bf38186b1d6a47fc
-  data.tar.gz: 0daf288fb6105cf9b96bd3d0663bfa1dc3e083707583fcf4f9a33c45e8fe186b355073ed643064769cdd7362ee27fb89cb47bad912c5fd5ba2cc752206191b2f
+  metadata.gz: 1329315ea58bed3ccadd8172b06b1556f63ad2e1d6582ad81ac749717ab68bffc41c0bff83e72df8c3f99c5a9823eee5f28ee9ee6b06e5ae829fa4a8ffd69cd1
+  data.tar.gz: 2e23832e6b2a0aef542f76887c2f5f488218b4c721e58b94b8c828e58b11ec1fca7384c2022d3ccaa77e0ef8a43d6eed3eade51c913d68c846e8c81cc42741d1

data/lib/httpclient.rb

@@ -958,7 +958,7 @@ private
       body.pos = pos if pos
       req = create_request(method, uri, query, body, header)
       begin
-        protect_keep_alive_disconnected(req) do
+        protect_keep_alive_disconnected do
           do_get_block(req, proxy, conn, &block)
         end
         res = conn.pop
@@ -984,7 +984,7 @@ private
           body.pos = pos if pos
           req = create_request(method, uri, query, body, header)
           begin
-            protect_keep_alive_disconnected(req) do
+            protect_keep_alive_disconnected do
               do_get_stream(req, proxy, tconn)
             end
             break
@@ -1054,14 +1054,14 @@ private
     end
   end
 
-  def protect_keep_alive_disconnected(req)
+  def protect_keep_alive_disconnected
     begin
       yield
     rescue KeepAliveDisconnected => e
       if e.sess
         @session_manager.invalidate(e.sess.dest)
       end
-      yield if req.use_persistent_connection?
+      yield
     end
   end
 

data/lib/httpclient/cookie.rb

@@ -25,9 +25,9 @@ class WebAgent
 
     def tail_match?(str1, str2)
       if str1.length > 0
-	str1 == str2[-str1.length..-1].to_s
+        str1 == str2[-str1.length..-1].to_s
       else
-	true
+        true
       end
     end
 
@@ -37,14 +37,14 @@ class WebAgent
       hostname = host.sub(/\.\z/, '').downcase
       case domain
       when /\d+\.\d+\.\d+\.\d+/
-	return (hostname == domainname)
-      when '.' 
-	return true
+        return (hostname == domainname)
+      when '.'
+        return true
       when /^\./
         # allows; host == rubyforge.org, domain == .rubyforge.org
-	return tail_match?(domainname, '.' + hostname)
+        return tail_match?(domainname, '.' + hostname)
       else
-	return (hostname == domainname)
+        return (hostname == domainname)
       end
     end
   end
@@ -128,12 +128,12 @@ class WebAgent
     def match?(url)
       domainname = url.host
       if (!domainname ||
-	  !domain_match(domainname, @domain) ||
-	  (@path && !head_match?(@path, url.path.empty? ? '/' : url.path)) ||
-	  (@secure && (url.scheme != 'https')) )
-	return false
+          !domain_match(domainname, @domain) ||
+          (@path && !head_match?(@path, url.path.empty? ? '/' : url.path)) ||
+          (@secure && (url.scheme != 'https')) )
+        return false
       else
-	return true
+        return true
       end
     end
 
@@ -141,22 +141,22 @@ class WebAgent
       ret = Array.new
       old_elem = nil
       array.each{|elem|
-	if (elem.scan(/"/).length % 2) == 0
-	  if old_elem
-	    old_elem << sep << elem
-	  else
-	    ret << elem
-	    old_elem = nil
-	  end  
-	else
-	  if old_elem
-	    old_elem << sep << elem
-	    ret << old_elem
-	    old_elem = nil
-	  else
-	    old_elem = elem.dup
-	  end
-	end
+        if (elem.scan(/"/).length % 2) == 0
+          if old_elem
+            old_elem << sep << elem
+          else
+            ret << elem
+            old_elem = nil
+          end
+        else
+          if old_elem
+            old_elem << sep << elem
+            ret << old_elem
+            old_elem = nil
+          else
+            old_elem = elem.dup
+          end
+        end
       }
       ret
     end
@@ -169,37 +169,37 @@ class WebAgent
       cookie_elem -= [""] # del empty elements, a cookie might included ";;"
       first_elem = cookie_elem.shift
       if first_elem !~ /([^=]*)(\=(.*))?/
-	return
-	## raise ArgumentError 'invalid cookie value'
+        return
+        ## raise ArgumentError 'invalid cookie value'
       end
       @name = $1.strip
       @value = normalize_cookie_value($3)
       cookie_elem.each{|pair|
-	key, value = pair.split(/=/, 2)  ## value may nil
-	key.strip!
+        key, value = pair.split(/=/, 2)  ## value may nil
+        key.strip!
         value = normalize_cookie_value(value)
-	case key.downcase
-	when 'domain'
-	  @domain = value
-	when 'expires'
+        case key.downcase
+        when 'domain'
+          @domain = value
+        when 'expires'
           @expires = nil
-	  begin
-	    @expires = Time.parse(value).gmtime if value
-	  rescue ArgumentError
-	  end
-	when 'path'
-	  @path = value
-	when 'secure'
-	  @secure = true  ## value may nil, but must 'true'.
-	when 'httponly'
-	  @http_only = true  ## value may nil, but must 'true'.
-	else
+          begin
+            @expires = Time.parse(value).gmtime if value
+          rescue ArgumentError
+          end
+        when 'path'
+          @path = value
+        when 'secure'
+          @secure = true  ## value may nil, but must 'true'.
+        when 'httponly'
+          @http_only = true  ## value may nil, but must 'true'.
+        else
           warn("Unknown key: #{key} = #{value}")
-	end
+        end
       }
     end
 
-  private
+    private
 
     def normalize_cookie_value(value)
       if value
@@ -210,6 +210,13 @@ class WebAgent
     end
   end
 
+  ##
+  # An Array class that already includes the MonitorMixin module.
+  #
+  class SynchronizedArray < Array
+    include MonitorMixin
+  end
+
   class CookieManager
     include CookieUtils
 
@@ -223,8 +230,7 @@ class WebAgent
     attr_accessor :accept_domains, :reject_domains
 
     def initialize(file=nil)
-      @cookies = Array.new
-      @cookies.extend(MonitorMixin)
+      @cookies = SynchronizedArray.new
       @cookies_file = file
       @is_saved = true
       @reject_domains = Array.new
@@ -233,8 +239,11 @@ class WebAgent
     end
 
     def cookies=(cookies)
-      @cookies = cookies
-      @cookies.extend(MonitorMixin)
+      if cookies.is_a?(SynchronizedArray)
+        @cookies = cookies
+      else
+        @cookies = SynchronizedArray.new(cookies)
+      end
     end
 
     def save_all_cookies(force = nil, save_unused = true, save_discarded = true)
@@ -246,7 +255,7 @@ class WebAgent
         File.open(@cookies_file, 'w') do |f|
           @cookies.each do |cookie|
             if (cookie.use? or save_unused) and
-                (!cookie.discard? or save_discarded)
+              (!cookie.discard? or save_discarded)
               f.print(cookie.url.to_s,"\t",
                       cookie.name,"\t",
                       cookie.value,"\t",
@@ -327,10 +336,10 @@ class WebAgent
       cookie.path_orig = given.path
 
       if cookie.discard? || cookie.expires == nil
-	cookie.discard = true
+        cookie.discard = true
       else
-	cookie.discard = false
-	@is_saved = false
+        cookie.discard = false
+        @is_saved = false
       end
     end
 
@@ -362,33 +371,33 @@ class WebAgent
     # Who use it?
     def check_cookie_accept_domain(domain)
       unless domain
-	return false
+        return false
       end
       @accept_domains.each{|dom|
-	if domain_match(domain, dom)
-	  return true
-	end
+        if domain_match(domain, dom)
+          return true
+        end
       }
       @reject_domains.each{|dom|
-	if domain_match(domain, dom)
-	  return false
-	end
+        if domain_match(domain, dom)
+          return false
+        end
       }
       return true
     end
 
-  private
+    private
 
     def make_cookie_str(cookie_list)
       if cookie_list.empty?
-	return nil
+        return nil
       end
 
       ret = ''
       c = cookie_list.shift
       ret += "#{c.name}=#{c.value}"
       cookie_list.each{|cookie|
-	ret += "; #{cookie.name}=#{cookie.value}"
+        ret += "; #{cookie.name}=#{cookie.value}"
       }
       return ret
     end
@@ -432,7 +441,7 @@ class WebAgent
     # not tested well; used only netscape_rule = true.
     def cookie_error(err, override)
       if !err.kind_of?(ErrorOverrideOK) || !override
-	raise err
+        raise err
       end
     end
   end

data/lib/httpclient/http.rb

@@ -1043,10 +1043,6 @@ module HTTP
     def see_other?
       status == HTTP::Status::SEE_OTHER
     end
-
-    def use_persistent_connection?
-      header.request_method != 'POST' && header.request_method != 'PUT'
-    end
   end
 
 end

data/lib/httpclient/session.rb

@@ -200,7 +200,7 @@ class HTTPClient
     # each session.
     def get_session(req, via_proxy = false)
       site = Site.new(req.header.request_uri)
-      if req.use_persistent_connection? && cached = get_cached_session(site)
+      if cached = get_cached_session(site)
         cached
       else
         open(req.header.request_uri, via_proxy)

data/lib/httpclient/version.rb

@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '2.5.3.1'
+  VERSION = '2.5.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpclient
 version: !ruby/object:Gem::Version
-  version: 2.5.3.1
+  version: 2.5.3.2
 platform: ruby
 authors:
 - Hiroshi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nahi@ruby-lang.org