httpclient 2.1.4 → 2.1.5

data/lib/httpclient/cookie.rb

@@ -160,8 +160,10 @@ class WebAgent
 
     def parse(str, url)
       @url = url
+      # TODO: should not depend on join_quotedstr. scan with escape like CSV.
       cookie_elem = str.split(/;/)
       cookie_elem = join_quotedstr(cookie_elem, ';')
+      cookie_elem -= [""] # del empty elements, a cookie might included ";;"
       first_elem = cookie_elem.shift
       if first_elem !~ /([^=]*)(\=(.*))?/
 	return
@@ -170,7 +172,7 @@ class WebAgent
       @name = $1.strip
       @value = normalize_cookie_value($3)
       cookie_elem.each{|pair|
-	key, value = pair.split(/=/)  ## value may nil
+	key, value = pair.split(/=/, 2)  ## value may nil
 	key.strip!
         value = normalize_cookie_value(value)
 	case key.downcase

data/lib/httpclient/http.rb

@@ -320,7 +320,7 @@ module HTTP
         end
         if @chunked
           set('Transfer-Encoding', 'chunked')
-        elsif keep_alive or @body_size != 0
+        elsif @body_size and (keep_alive or @body_size != 0)
           set('Content-Length', @body_size.to_s)
         end
         if @http_version >= 1.1
@@ -623,7 +623,7 @@ module HTTP
       def new_connect_request(uri)
         m = new
         m.header.init_connect_request(uri)
-        m.header.body_size = 0
+        m.header.body_size = nil
         m
       end
 
@@ -645,8 +645,12 @@ module HTTP
         m.header.init_request(method, uri, query)
         m.body = Body.new
         m.body.init_request(body || '', boundary)
-        m.header.body_size = m.body.size
-        m.header.chunked = true if m.body.size.nil?
+        if body
+          m.header.body_size = m.body.size
+          m.header.chunked = true if m.body.size.nil?
+        else
+          m.header.body_size = nil
+        end
         m
       end
 

data/lib/httpclient/session.rb

@@ -445,7 +445,7 @@ class HTTPClient
     include SocketWrap
 
     def initialize(host, port, response)
-      super(StringIO.new(response))
+      super(response.is_a?(StringIO) ? response : StringIO.new(response))
       @host = host
       @port = port
     end
@@ -800,9 +800,13 @@ class HTTPClient
         maxbytes = @read_block_size
         maxbytes = @content_length if maxbytes > @content_length
         timeout(@receive_timeout, ReceiveTimeoutError) do
-          @socket.readpartial(maxbytes, buf) rescue EOFError
+          begin
+            @socket.readpartial(maxbytes, buf)
+          rescue EOFError
+            buf = nil
+          end
         end
-        if buf.length > 0
+        if buf && buf.length > 0
           @content_length -= buf.length
           yield buf
         else
@@ -840,7 +844,11 @@ class HTTPClient
       buf = ''
       while true
         timeout(@receive_timeout, ReceiveTimeoutError) do
-          @socket.readpartial(@read_block_size, buf) rescue EOFError
+          begin
+            @socket.readpartial(@read_block_size, buf)
+          rescue EOFError
+            buf = nil
+          end
         end
         if buf && buf.length > 0
           yield buf

data/lib/httpclient/ssl_config.rb

@@ -343,23 +343,28 @@ class HTTPClient
       if File.exist?(file)
         dist_cert =<<__DIST_CERT__
 -----BEGIN CERTIFICATE-----
-MIIC/jCCAmegAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMQswCQYDVQQGEwJKUDER
-MA8GA1UECgwIY3Rvci5vcmcxFDASBgNVBAsMC0RldmVsb3BtZW50MRUwEwYDVQQD
-DAxodHRwLWFjY2VzczIwHhcNMDcwOTExMTM1ODMxWhcNMDkwOTEwMTM1ODMxWjBN
-MQswCQYDVQQGEwJKUDERMA8GA1UECgwIY3Rvci5vcmcxFDASBgNVBAsMC0RldmVs
-b3BtZW50MRUwEwYDVQQDDAxodHRwLWFjY2VzczIwgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBALi66ujWtUCQm5HpMSyr/AAIFYVXC/dmn7C8TR/HMiUuW3waY4uX
-LFqCDAGOX4gf177pX+b99t3mpaiAjJuqc858D9xEECzhDWgXdLbhRqWhUOble4RY
-c1yWYC990IgXJDMKx7VAuZ3cBhdBxtlE9sb1ZCzmHQsvTy/OoRzcJCrTAgMBAAGj
-ge0wgeowDwYDVR0TAQH/BAUwAwEB/zAxBglghkgBhvhCAQ0EJBYiUnVieS9PcGVu
-U1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJNE0GGaRKmN2qhnO
-FyBWVl4Qj6owDgYDVR0PAQH/BAQDAgEGMHUGA1UdIwRuMGyAFCTRNBhmkSpjdqoZ
-zhcgVlZeEI+qoVGkTzBNMQswCQYDVQQGEwJKUDERMA8GA1UECgwIY3Rvci5vcmcx
-FDASBgNVBAsMC0RldmVsb3BtZW50MRUwEwYDVQQDDAxodHRwLWFjY2VzczKCAQEw
-DQYJKoZIhvcNAQEFBQADgYEAH11tstSUuqFpMqoh/vM5l3Nqb8ygblbqEYQs/iG/
-UeQkOZk/P1TxB6Ozn2htJ1srqDpUsncFVZ/ecP19GkeOZ6BmIhppcHhE5WyLBcPX
-It5q1BW0PiAzT9LlEGoaiW0nw39so0Pr1whJDfc1t4fjdk+kSiMIzRHbTDvHWfpV
-nTA=
+MIID/TCCAuWgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBLMQswCQYDVQQGEwJKUDER
+MA8GA1UECgwIY3Rvci5vcmcxFDASBgNVBAsMC0RldmVsb3BtZW50MRMwEQYDVQQD
+DApodHRwY2xpZW50MB4XDTA5MDUyMTEyMzkwNVoXDTM3MTIzMTIzNTk1OVowSzEL
+MAkGA1UEBhMCSlAxETAPBgNVBAoMCGN0b3Iub3JnMRQwEgYDVQQLDAtEZXZlbG9w
+bWVudDETMBEGA1UEAwwKaHR0cGNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAM2PlkdTH97zvIHoPIMj87wnNvpqIQUD7L/hlysO0XBsmR/XZUeU
+ZKB10JQqMXviWpTnU9KU6xGTx3EI4wfd2dpLwH/d4d7K4LngW1kY7kJlZeJhakno
+GzQ40RSI9WkQ0R9KOE888f7OkTBafcL8UyWFVIMhQBw2d9iNl4Jc69QojayCDoSX
+XbbEP0n8yi7HwIU3RFuX6DtMpOx4/1K7Z002ccOGJ3J9kHgeDQSQtF42cQYC7qj2
+67I/OQgnB7ycxTCP0E7bdXQg+zqsngrhaoNn/+I+CoO7nD4t4uQ+B4agALh4PPxs
+bQD9MCL+VurNGLYv0HVd+ZlLblpddC9PLTsCAwEAAaOB6zCB6DAPBgNVHRMBAf8E
+BTADAQH/MDEGCWCGSAGG+EIBDQQkFiJSdWJ5L09wZW5TU0wgR2VuZXJhdGVkIENl
+cnRpZmljYXRlMB0GA1UdDgQWBBRAnB6XlMoOcm7HVAw+JWxY205PHTAOBgNVHQ8B
+Af8EBAMCAQYwcwYDVR0jBGwwaoAUQJwel5TKDnJux1QMPiVsWNtOTx2hT6RNMEsx
+CzAJBgNVBAYTAkpQMREwDwYDVQQKDAhjdG9yLm9yZzEUMBIGA1UECwwLRGV2ZWxv
+cG1lbnQxEzARBgNVBAMMCmh0dHBjbGllbnSCAQEwDQYJKoZIhvcNAQENBQADggEB
+ABVFepybD5XqsBnOn/oDHvK0xAPMF4Ap4Ht1yMQLObg8paVhANSdqIevPlCr/mPL
+DRjcy+J1fCnE6lCfsfLdTgAjirqt8pm92NccxmJ8hTmMd3LWC1n+eYWaolqTCVRM
+Bpe8UY9enyXrFoudHlr9epr18E6As6VrCSfpXFZkD9WHVSWpzkB3qATu5qcDCzCH
+bI0755Mdm/1hKJCD4l69h3J3OhRIEUPJfHnPvM5wtiyC2dcE9itwE/wdVzBJeIBX
+JQm+Qj+K8qXcRTzZZGIBjw2n46xJgW6YncNCHU/WWfNCYwdkngHS/aN8IbEjhCwf
+viXFisVrDN/+pZZGMf67ZaY=
 -----END CERTIFICATE-----
 __DIST_CERT__
         p7 = PKCS7.read_smime(File.open(file) { |f| f.read })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: httpclient
 version: !ruby/object:Gem::Version 
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors: 
 - NAKAMURA, Hiroshi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-13 00:00:00 +09:00
+date: 2009-05-25 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -35,9 +35,11 @@ files:
 - lib/httpclient/ssl_config.rb
 - lib/httpclient/timeout.rb
 - lib/httpclient/cookie.rb
+- lib/httpclient/auth.rb.orig
 - lib/httpclient/cacert.p7s
 - lib/httpclient.rb
 - lib/http-access2.rb
+- lib/httpclient.rb.orig
 has_rdoc: true
 homepage: http://dev.ctor.org/httpclient
 post_install_message: