glebtv-httpclient 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b3a52b69fd448d0c599833a4a537da54d5e2fe0
-  data.tar.gz: c4dabdf30e8d87b39956940f1b59884635c35912
+  metadata.gz: 2e0d58e8386526ded8469cb960b0467c25bb5f66
+  data.tar.gz: 3878a8b5e3846806535aba2c68c268a2edfdd74c
 SHA512:
-  metadata.gz: f2fb7a147cf97fbd8b294378c2087b6a4756c87a86822b98d83e5dcda96698792aa9709a0c5c4636d62ce4db020ee9ff6b7f681f628ca5e094b199e094aae839
-  data.tar.gz: a26ef8ba9516957134d043da93f2411a0f237e8846998784289e7dc6d8f827eb77f94f46ef700ef7aa18dd66cbc1c5639c7be359a782687221af6c4b7165e71d
+  metadata.gz: 6caeace7cf8c7a9d288f7b84d7a03c08a1a24905f480e6d9881d610e3c98e6f508960107850ca37d15e8e1e4649784d5614a2f88bf1e1f696451f29d993ba2b6
+  data.tar.gz: 744bd70d9962218693a973d9042f6ddf7966078314043cdfad75b86801897a6c6d4ce9e7331b5ccb6b9ae922eb171642acca10a160012500c1004209c3fb0e78

data/README.md

@@ -0,0 +1,173 @@
+## About this fork
+
+I just try to make it work properly (as a browser would) for my use cases.
+
+[![Build Status](https://travis-ci.org/glebtv/httpclient.png?branch=master)](https://travis-ci.org/glebtv/httpclient)
+[![Gem Version](https://badge.fury.io/rb/glebtv-httpclient.png)](http://badge.fury.io/rb/glebtv-httpclient)
+[![Dependency Status](https://gemnasium.com/glebtv/httpclient.png)](https://gemnasium.com/glebtv/httpclient)
+
+If you don't like how something works, please send a PR or use original gem: https://github.com/nahi/httpclient
+
+## Install
+
+    gem install glebtv-httpclient
+
+or  
+
+    gem 'httpclient'
+
+
+## Usage example:
+
+To serve as a starting point (cannot be used as-is, you will need to adjust settings, paths, etc)
+
+```ruby
+class Ht
+  attr_accessor :user_agent, :clnt, :cookie_jar, :referer
+
+  def initialize()
+    @user_agent = 'test_app'
+    
+    @cookie_jar = ROOT_PATH + '/cookies.txt'
+    @referer = nil
+    @clnt = HTTPClient.new
+
+    @clnt.set_cookie_store(@cookie_jar)
+    # @clnt.socket_local.host = 'ip here'
+    @clnt.transparent_gzip_decompression = true
+    # @clnt.debug_dev = STDERR
+  end
+
+  def flush_cookies
+    @clnt.save_cookie_store
+  end
+
+  def urify(uri)
+    HTTPClient::Util.urify(uri)
+  end
+
+  def request(method, uri, params = nil)
+    if method.to_s == 'get'
+      query = params
+      body = nil
+    else
+      query = nil
+      body = URI.encode_www_form(params)
+    end
+
+    process(method, uri, query: query, body: body)
+  end
+
+  def process(method, uri, options)
+    retry_number = 0
+    while retry_number < 10
+      options = options.merge(header: headers, follow_redirect: false)
+      res = @clnt.request(method, uri.to_s, options)
+      if res.redirect?
+        if res.see_other? || res.found?
+          method = :get
+          options.delete(:body)
+        end
+        @referer = uri.to_s
+        uri = @clnt.default_redirect_uri_callback(urify(uri), res)
+        $logger.info "redirect to #{uri}"
+        retry_number += 1
+      else
+        @referer = uri.to_s
+        if res.ok?
+          return res
+        else
+          puts "BAD RESPONSE FOR #{uri}"
+          p options
+          puts "HEADER:"
+          puts res.header.dump
+          puts "CONTENT:"
+          puts res.content
+          raise HTTPClient::BadResponseError.new("unexpected response", res)
+        end
+      end
+    end
+    raise 'redirect loop detected'
+  end
+
+  def headers
+    ret = {
+        'Accept' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+        'Accept-Language' => 'ru,en;q=0.5',
+        'User-Agent' => @user_agent,
+    }
+    ret['Referer'] = @referer unless @referer.nil?
+    ret
+  end
+end
+```
+
+
+## Original gem readme
+
+httpclient - HTTP accessing library.
+Copyright (C) 2000-2012  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>.
+
+'httpclient' gives something like the functionality of libwww-perl (LWP) in
+Ruby.  'httpclient' formerly known as 'http-access2'.
+
+See HTTPClient for documentation.
+
+
+## Features
+
+* methods like GET/HEAD/POST/* via HTTP/1.1.
+* HTTPS(SSL), Cookies, proxy, authentication(Digest, NTLM, Basic), etc.
+* asynchronous HTTP request, streaming HTTP request.
+* debug mode CLI.
+
+* by contrast with net/http in standard distribution;
+  * Cookies support
+  * MT-safe
+  * streaming POST (POST with File/IO)
+  * Digest auth
+  * Negotiate/NTLM auth for WWW-Authenticate (requires net/ntlm module; rubyntlm gem)
+  * NTLM auth for Proxy-Authenticate (requires 'win32/sspi' module; rubysspi gem)
+  * extensible with filter interface
+  * you don't have to care HTTP/1.1 persistent connection
+    (httpclient cares instead of you)
+
+* Not supported now
+  * Cache
+  * Rather advanced HTTP/1.1 usage such as Range, deflate, etc.
+    (of course you can set it in header by yourself)
+
+## httpclient command
+
+Usage:
+
+Issues a GET request to the given URI and shows the wiredump and the parsed result: 
+  
+    % httpclient get https://www.google.co.jp/ q=ruby
+
+Invokes irb shell with the binding that has a HTTPClient as 'self':
+
+    % httpclient
+
+You can call HTTPClient instance methods like:
+
+    > get "https://www.google.co.jp/", :q => :ruby
+
+## Author
+
+Name:: Hiroshi Nakamura
+E-mail:: nahi@ruby-lang.org
+Project web site:: http://github.com/nahi/httpclient
+
+
+## License
+
+This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+redistribute it and/or modify it under the same terms of Ruby's license;
+either the dual license version in 2003, or any later version.
+
+httpclient/session.rb is based on http-access.rb in http-access/0.0.4.  Some
+part of it is copyrighted by Maebashi-san who made and published
+http-access/0.0.4.  http-access/0.0.4 did not include license notice but when
+I asked Maebashi-san he agreed that I can redistribute it under the same terms
+of Ruby.  Many thanks to Maebashi-san.

data/lib/httpclient.rb

@@ -962,7 +962,7 @@ private
         # All browsers convert POST to GET on 302 redirects for historical reasons
         if res.see_other? || res.found?
           method = :get
-          body = ''
+          body = nil
           pos = nil
         end
         uri = urify(@redirect_uri_callback.call(uri, res))

data/lib/httpclient/version.rb

@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '3.0.2' unless defined?(VERSION)
+  VERSION = '3.1.0'
 end

data/test/test_httpclient.rb

@@ -607,7 +607,10 @@ EOS
 
     # all browsers use GET for 302
     post_body = StringIO.new("1234567890")
+    assert_equal('1234567890', @client.post_content(serverurl + 'servlet_413', post_body))
+
     assert_equal('', @client.get_content(serverurl + 'servlet_redirect_413'))
+    post_body = StringIO.new("1234567890")
     assert_equal('', @client.post_content(serverurl + 'servlet_redirect_413', post_body))
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-httpclient
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: glebtv@gmail.com
@@ -18,62 +18,58 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/httpclient
-- lib/http-access2/http.rb
-- lib/http-access2/cookie.rb
-- lib/httpclient/ssl_config.rb
-- lib/httpclient/cacert.p7s
+- lib/httpclient.rb
+- lib/glebtv-httpclient.rb
 - lib/httpclient/connection.rb
-- lib/httpclient/session.rb
 - lib/httpclient/http.rb
-- lib/httpclient/util.rb
 - lib/httpclient/version.rb
-- lib/httpclient/auth.rb
 - lib/httpclient/include_client.rb
-- lib/httpclient/timeout.rb
+- lib/httpclient/auth.rb
 - lib/httpclient/cookie.rb
-- lib/httpclient.rb
-- lib/oauthclient.rb
+- lib/httpclient/util.rb
+- lib/httpclient/timeout.rb
+- lib/httpclient/ssl_config.rb
+- lib/httpclient/session.rb
+- lib/httpclient/cacert.p7s
 - lib/hexdump.rb
-- lib/glebtv-httpclient.rb
-- lib/http-access2.rb
+- lib/oauthclient.rb
+- sample/ssl/webrick_httpsd.rb
+- sample/ssl/0key.pem
+- sample/ssl/htdocs/index.html
 - sample/ssl/1000cert.pem
 - sample/ssl/0cert.pem
-- sample/ssl/htdocs/index.html
 - sample/ssl/1000key.pem
-- sample/ssl/0key.pem
 - sample/ssl/ssl_client.rb
-- sample/ssl/webrick_httpsd.rb
-- sample/dav.rb
+- sample/stream.rb
+- sample/async.rb
 - sample/howto.rb
 - sample/auth.rb
+- sample/cookie.rb
+- sample/wcat.rb
+- sample/oauth_buzz.rb
 - sample/thread.rb
+- sample/dav.rb
 - sample/oauth_twitter.rb
-- sample/stream.rb
-- sample/async.rb
-- sample/cookie.rb
 - sample/oauth_friendfeed.rb
-- sample/oauth_buzz.rb
-- sample/wcat.rb
-- test/htpasswd
-- test/sslsvr.rb
-- test/test_cookie.rb
+- test/ca-chain.cert
+- test/test_hexdump.rb
 - test/htdigest
-- test/test_ssl.rb
-- test/subca.cert
-- test/test_http-access2.rb
-- test/test_httpclient.rb
 - test/server.key
-- test/test_hexdump.rb
-- test/helper.rb
-- test/test_auth.rb
-- test/test_include_client.rb
+- test/test_cookie.rb
 - test/client.cert
-- test/ca-chain.cert
+- test/htpasswd
 - test/server.cert
+- test/ca.cert
+- test/helper.rb
+- test/test_auth.rb
+- test/sslsvr.rb
 - test/client.key
+- test/test_ssl.rb
+- test/subca.cert
+- test/test_include_client.rb
 - test/runner.rb
-- test/ca.cert
-- README.rdoc
+- test/test_httpclient.rb
+- README.md
 homepage: http://github.com/glebtv/httpclient
 licenses:
 - ruby
@@ -94,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Fork of httpclient with some fixes and patches I needed. Please use original

data/README.rdoc

@@ -1,108 +0,0 @@
-httpclient - HTTP accessing library.
-Copyright (C) 2000-2012  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>.
-
-'httpclient' gives something like the functionality of libwww-perl (LWP) in
-Ruby.  'httpclient' formerly known as 'http-access2'.
-
-See HTTPClient for documentation.
-
-
-== Features
-
-* methods like GET/HEAD/POST/* via HTTP/1.1.
-* HTTPS(SSL), Cookies, proxy, authentication(Digest, NTLM, Basic), etc.
-* asynchronous HTTP request, streaming HTTP request.
-* debug mode CLI.
-
-* by contrast with net/http in standard distribution;
-  * Cookies support
-  * MT-safe
-  * streaming POST (POST with File/IO)
-  * Digest auth
-  * Negotiate/NTLM auth for WWW-Authenticate (requires net/ntlm module; rubyntlm gem)
-  * NTLM auth for Proxy-Authenticate (requires 'win32/sspi' module; rubysspi gem)
-  * extensible with filter interface
-  * you don't have to care HTTP/1.1 persistent connection
-    (httpclient cares instead of you)
-
-* Not supported now
-  * Cache
-  * Rather advanced HTTP/1.1 usage such as Range, deflate, etc.
-    (of course you can set it in header by yourself)
-
-== httpclient command
-
-Usage: 1) % httpclient get https://www.google.co.jp/ q=ruby
-Usage: 2) % httpclient
-
-For 1) it issues a GET request to the given URI and shows the wiredump and
-the parsed result.  For 2) it invokes irb shell with the binding that has a
-HTTPClient as 'self'.
-
-You can call HTTPClient instance methods like:
-
-  > get "https://www.google.co.jp/", :q => :ruby
-
-== Author
-
-Name:: Hiroshi Nakamura
-E-mail:: nahi@ruby-lang.org
-Project web site:: http://github.com/nahi/httpclient
-
-
-== License
-
-This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
-redistribute it and/or modify it under the same terms of Ruby's license;
-either the dual license version in 2003, or any later version.
-
-httpclient/session.rb is based on http-access.rb in http-access/0.0.4.  Some
-part of it is copyrighted by Maebashi-san who made and published
-http-access/0.0.4.  http-access/0.0.4 did not include license notice but when
-I asked Maebashi-san he agreed that I can redistribute it under the same terms
-of Ruby.  Many thanks to Maebashi-san.
-
-
-== Install
-
-=== Gem
-
-You can install httpclient with rubygems.
-
-  % gem install httpclient
-
-=== Package
-
-You can install httpclient with the bundled installer script.
-
-  $ ruby install.rb
-
-It will install lib/* to your site_ruby directory such as
-/usr/local/lib/ruby/site_ruby/1.8/.
-
-For uninstall, delete installed files from your site_ruby directory.
-
-
-== Usage
-
-See HTTPClient for documentation.
-You can also check sample/howto.rb how to use APIs.
-
-
-== Download
-
-* Gem repository
-  * https://rubygems.org/gems/httpclient
-
-* git: git://github.com/nahi/httpclient.git
-
-== Bug report or Feature request
-
-Please file a ticket at the project web site.
-
-1. find a similar ticket from https://github.com/nahi/httpclient/issues
-2. create a new ticket by clicking 'Create Issue' button.
-3. you can use github features such as pull-request if you like.
-
-Thanks in advance. 
-

data/lib/http-access2.rb

@@ -1,55 +0,0 @@
-# HTTPAccess2 - HTTP accessing library.
-# Copyright (C) 2000-2007  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>.
-
-# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
-# redistribute it and/or modify it under the same terms of Ruby's license;
-# either the dual license version in 2003, or any later version.
-
-# http-access2.rb is based on http-access.rb in http-access/0.0.4.  Some
-# part of it is copyrighted by Maebashi-san who made and published
-# http-access/0.0.4.  http-access/0.0.4 did not include license notice but
-# when I asked Maebashi-san he agreed that I can redistribute it under the
-# same terms of Ruby.  Many thanks to Maebashi-san.
-
-
-require 'httpclient'
-
-
-module HTTPAccess2
-  VERSION = ::HTTPClient::VERSION
-  RUBY_VERSION_STRING = ::HTTPClient::RUBY_VERSION_STRING
-  SSLEnabled = ::HTTPClient::SSLEnabled
-  SSPIEnabled = ::HTTPClient::SSPIEnabled
-  DEBUG_SSL = true
-
-  Util = ::HTTPClient::Util
-
-  class Client < ::HTTPClient
-    class RetryableResponse < StandardError
-    end
-  end
-
-  SSLConfig = ::HTTPClient::SSLConfig
-  BasicAuth = ::HTTPClient::BasicAuth
-  DigestAuth = ::HTTPClient::DigestAuth
-  NegotiateAuth = ::HTTPClient::NegotiateAuth
-  AuthFilterBase = ::HTTPClient::AuthFilterBase
-  WWWAuth = ::HTTPClient::WWWAuth
-  ProxyAuth = ::HTTPClient::ProxyAuth
-  Site = ::HTTPClient::Site
-  Connection = ::HTTPClient::Connection
-  SessionManager = ::HTTPClient::SessionManager
-  SSLSocketWrap = ::HTTPClient::SSLSocketWrap
-  DebugSocket = ::HTTPClient::DebugSocket
-
-  class Session < ::HTTPClient::Session
-    class Error < StandardError
-    end
-    class InvalidState < Error
-    end
-    class BadResponse < Error
-    end
-    class KeepAliveDisconnected < Error
-    end
-  end
-end

data/lib/http-access2/cookie.rb

@@ -1 +0,0 @@
-require 'httpclient/cookie'

data/lib/http-access2/http.rb

@@ -1 +0,0 @@
-require 'httpclient/http'

data/test/test_http-access2.rb

@@ -1,507 +0,0 @@
-require 'http-access2'
-require File.expand_path('helper', File.dirname(__FILE__))
-
-
-module HTTPAccess2
-
-
-class TestClient < Test::Unit::TestCase
-  include Helper
-  include HTTPClient::Util
-
-  def setup
-    super
-    setup_server
-    setup_client
-  end
-
-  def teardown
-    super
-  end
-
-  def test_initialize
-    setup_proxyserver
-    escape_noproxy do
-      @proxyio.string = ""
-      @client = HTTPAccess2::Client.new(proxyurl)
-      assert_equal(urify(proxyurl), @client.proxy)
-      assert_equal(200, @client.head(serverurl).status)
-      assert(!@proxyio.string.empty?)
-    end
-  end
-
-  def test_agent_name
-    @client = HTTPAccess2::Client.new(nil, "agent_name_foo")
-    str = ""
-    @client.debug_dev = str
-    @client.get(serverurl)
-    lines = str.split(/(?:\r?\n)+/)
-    assert_equal("= Request", lines[0])
-    assert_match(/^User-Agent: agent_name_foo/, lines[4])
-  end
-
-  def test_from
-    @client = HTTPAccess2::Client.new(nil, nil, "from_bar")
-    str = ""
-    @client.debug_dev = str
-    @client.get(serverurl)
-    lines = str.split(/(?:\r?\n)+/)
-    assert_equal("= Request", lines[0])
-    assert_match(/^From: from_bar/, lines[5])
-  end
-
-  def test_debug_dev
-    str = ""
-    @client.debug_dev = str
-    assert(str.empty?)
-    @client.get(serverurl)
-    assert(!str.empty?)
-  end
-
-  def _test_protocol_version_http09
-    @client.protocol_version = 'HTTP/0.9'
-    str = ""
-    @client.debug_dev = str
-    @client.get(serverurl + 'hello')
-    lines = str.split(/(?:\r?\n)+/)
-    assert_equal("= Request", lines[0])
-    assert_equal("! CONNECTION ESTABLISHED", lines[2])
-    assert_equal("GET /hello HTTP/0.9", lines[3])
-    assert_equal("Connection: close", lines[5])
-    assert_equal("= Response", lines[6])
-    assert_match(/^hello/, lines[7])
-  end
-
-  def test_protocol_version_http10
-    @client.protocol_version = 'HTTP/1.0'
-    str = ""
-    @client.debug_dev = str
-    @client.get(serverurl + 'hello')
-    lines = str.split(/(?:\r?\n)+/)
-    assert_equal("= Request", lines[0])
-    assert_equal("! CONNECTION ESTABLISHED", lines[2])
-    assert_equal("GET /hello HTTP/1.0", lines[3])
-    assert_equal("Connection: close", lines[7])
-    assert_equal("= Response", lines[8])
-  end
-
-  def test_protocol_version_http11
-    str = ""
-    @client.debug_dev = str
-    @client.get(serverurl)
-    lines = str.split(/(?:\r?\n)+/)
-    assert_equal("= Request", lines[0])
-    assert_equal("! CONNECTION ESTABLISHED", lines[2])
-    assert_equal("GET / HTTP/1.1", lines[3])
-    assert_equal("Host: localhost:#{serverport}", lines[7])
-    @client.protocol_version = 'HTTP/1.1'
-    str = ""
-    @client.debug_dev = str
-    @client.get(serverurl)
-    lines = str.split(/(?:\r?\n)+/)
-    assert_equal("= Request", lines[0])
-    assert_equal("! CONNECTION ESTABLISHED", lines[2])
-    assert_equal("GET / HTTP/1.1", lines[3])
-    @client.protocol_version = 'HTTP/1.0'
-    str = ""
-    @client.debug_dev = str
-    @client.get(serverurl)
-    lines = str.split(/(?:\r?\n)+/)
-    assert_equal("= Request", lines[0])
-    assert_equal("! CONNECTION ESTABLISHED", lines[2])
-    assert_equal("GET / HTTP/1.0", lines[3])
-  end
-
-  def test_proxy
-    setup_proxyserver
-    escape_noproxy do
-      begin
-       	@client.proxy = "http://"
-      rescue
-        assert_match(/InvalidURIError/, $!.class.to_s)
-      end
-      @client.proxy = ""
-      assert_nil(@client.proxy)
-      @client.proxy = "http://foo:1234"
-      assert_equal(urify("http://foo:1234"), @client.proxy)
-      uri = urify("http://bar:2345")
-      @client.proxy = uri
-      assert_equal(uri, @client.proxy)
-      #
-      @proxyio.string = ""
-      @client.proxy = nil
-      assert_equal(200, @client.head(serverurl).status)
-      assert(@proxyio.string.empty?)
-      #
-      @proxyio.string = ""
-      @client.proxy = proxyurl
-      assert_equal(200, @client.head(serverurl).status)
-      assert(!@proxyio.string.empty?)
-    end
-  end
-
-  def test_noproxy_for_localhost
-    @proxyio.string = ""
-    @client.proxy = proxyurl
-    assert_equal(200, @client.head(serverurl).status)
-    assert(@proxyio.string.empty?)
-  end
-
-  def test_no_proxy
-    setup_proxyserver
-    escape_noproxy do
-      # proxy is not set.
-      @client.no_proxy = 'localhost'
-      @proxyio.string = ""
-      @client.proxy = nil
-      assert_equal(200, @client.head(serverurl).status)
-      assert(/accept/ !~ @proxyio.string)
-      #
-      @proxyio.string = ""
-      @client.proxy = proxyurl
-      assert_equal(200, @client.head(serverurl).status)
-      assert(/accept/ !~ @proxyio.string)
-      #
-      @client.no_proxy = 'foobar'
-      @proxyio.string = ""
-      @client.proxy = proxyurl
-      assert_equal(200, @client.head(serverurl).status)
-      assert(/accept/ =~ @proxyio.string)
-      #
-      @client.no_proxy = 'foobar,localhost:baz'
-      @proxyio.string = ""
-      @client.proxy = proxyurl
-      assert_equal(200, @client.head(serverurl).status)
-      assert(/accept/ !~ @proxyio.string)
-      #
-      @client.no_proxy = 'foobar,localhost:443'
-      @proxyio.string = ""
-      @client.proxy = proxyurl
-      assert_equal(200, @client.head(serverurl).status)
-      assert(/accept/ =~ @proxyio.string)
-      #
-      @client.no_proxy = "foobar,localhost:443:localhost:#{serverport},baz"
-      @proxyio.string = ""
-      @client.proxy = proxyurl
-      assert_equal(200, @client.head(serverurl).status)
-      assert(/accept/ !~ @proxyio.string)
-    end
-  end
-
-  def test_get_content
-    assert_equal('hello', @client.get_content(serverurl + 'hello'))
-    assert_equal('hello', @client.get_content(serverurl + 'redirect1'))
-    assert_equal('hello', @client.get_content(serverurl + 'redirect2'))
-    assert_raises(HTTPClient::Session::BadResponse) do
-      @client.get_content(serverurl + 'notfound')
-    end
-    assert_raises(HTTPClient::Session::BadResponse) do
-      @client.get_content(serverurl + 'redirect_self')
-    end
-    called = false
-    @client.redirect_uri_callback = lambda { |uri, res|
-      newuri = res.header['location'][0]
-      called = true
-      newuri
-    }
-    assert_equal('hello', @client.get_content(serverurl + 'relative_redirect'))
-    assert(called)
-  end
-
-  def test_post_content
-    assert_equal('hello', @client.post_content(serverurl + 'hello'))
-    assert_equal('hello', @client.post_content(serverurl + 'redirect1'))
-    assert_equal('hello', @client.post_content(serverurl + 'redirect2'))
-    assert_raises(HTTPClient::Session::BadResponse) do
-      @client.post_content(serverurl + 'notfound')
-    end
-    assert_raises(HTTPClient::Session::BadResponse) do
-      @client.post_content(serverurl + 'redirect_self')
-    end
-    called = false
-    @client.redirect_uri_callback = lambda { |uri, res|
-      newuri = res.header['location'][0]
-      called = true
-      newuri
-    }
-    assert_equal('hello', @client.post_content(serverurl + 'relative_redirect'))
-    assert(called)
-  end
-
-  def test_head
-    assert_equal("head", @client.head(serverurl + 'servlet').header["x-head"][0])
-    param = {'1'=>'2', '3'=>'4'}
-    res = @client.head(serverurl + 'servlet', param)
-    assert_equal(param, params(res.header["x-query"][0]))
-  end
-
-  def test_get
-    assert_equal("get", @client.get(serverurl + 'servlet').content)
-    param = {'1'=>'2', '3'=>'4'}
-    res = @client.get(serverurl + 'servlet', param)
-    assert_equal(param, params(res.header["x-query"][0]))
-  end
-
-  def test_post
-    assert_equal("post", @client.post(serverurl + 'servlet').content)
-    param = {'1'=>'2', '3'=>'4'}
-    res = @client.get(serverurl + 'servlet', param)
-    assert_equal(param, params(res.header["x-query"][0]))
-  end
-
-  def test_put
-    assert_equal("put", @client.put(serverurl + 'servlet').content)
-    param = {'1'=>'2', '3'=>'4'}
-    res = @client.get(serverurl + 'servlet', param)
-    assert_equal(param, params(res.header["x-query"][0]))
-  end
-
-  def test_delete
-    assert_equal("delete", @client.delete(serverurl + 'servlet').content)
-    param = {'1'=>'2', '3'=>'4'}
-    res = @client.get(serverurl + 'servlet', param)
-    assert_equal(param, params(res.header["x-query"][0]))
-  end
-
-  def test_options
-    assert_equal("options", @client.options(serverurl + 'servlet').content)
-    param = {'1'=>'2', '3'=>'4'}
-    res = @client.get(serverurl + 'servlet', param)
-    assert_equal(param, params(res.header["x-query"][0]))
-  end
-
-  def test_trace
-    assert_equal("trace", @client.trace(serverurl + 'servlet').content)
-    param = {'1'=>'2', '3'=>'4'}
-    res = @client.get(serverurl + 'servlet', param)
-    assert_equal(param, params(res.header["x-query"][0]))
-  end
-
-  def test_get_query
-    assert_equal({'1'=>'2'}, check_query_get({1=>2}))
-    assert_equal({'a'=>'A', 'B'=>'b'}, check_query_get({"a"=>"A", "B"=>"b"}))
-    assert_equal({'&'=>'&'}, check_query_get({"&"=>"&"}))
-    assert_equal({'= '=>' =+'}, check_query_get({"= "=>" =+"}))
-    assert_equal(
-      ['=', '&'].sort,
-      check_query_get([["=", "="], ["=", "&"]])['='].to_ary.sort
-    )
-    assert_equal({'123'=>'45'}, check_query_get('123=45'))
-    assert_equal({'12 3'=>'45', ' '=>' '}, check_query_get('12+3=45&+=+'))
-    assert_equal({}, check_query_get(''))
-  end
-
-  def test_post_body
-    assert_equal({'1'=>'2'}, check_query_post({1=>2}))
-    assert_equal({'a'=>'A', 'B'=>'b'}, check_query_post({"a"=>"A", "B"=>"b"}))
-    assert_equal({'&'=>'&'}, check_query_post({"&"=>"&"}))
-    assert_equal({'= '=>' =+'}, check_query_post({"= "=>" =+"}))
-    assert_equal(
-      ['=', '&'].sort,
-      check_query_post([["=", "="], ["=", "&"]])['='].to_ary.sort
-    )
-    assert_equal({'123'=>'45'}, check_query_post('123=45'))
-    assert_equal({'12 3'=>'45', ' '=>' '}, check_query_post('12+3=45&+=+'))
-    assert_equal({}, check_query_post(''))
-    #
-    post_body = StringIO.new("foo=bar&foo=baz")
-    assert_equal(
-      ["bar", "baz"],
-      check_query_post(post_body)["foo"].to_ary.sort
-    )
-  end
-
-  def test_extra_headers
-    str = ""
-    @client.debug_dev = str
-    @client.head(serverurl, nil, {"ABC" => "DEF"})
-    lines = str.split(/(?:\r?\n)+/)
-    assert_equal("= Request", lines[0])
-    assert_match("ABC: DEF", lines[4])
-    #
-    str = ""
-    @client.debug_dev = str
-    @client.get(serverurl, nil, [["ABC", "DEF"], ["ABC", "DEF"]])
-    lines = str.split(/(?:\r?\n)+/)
-    assert_equal("= Request", lines[0])
-    assert_match("ABC: DEF", lines[4])
-    assert_match("ABC: DEF", lines[5])
-  end
-
-  def test_timeout
-    assert_equal(60, @client.connect_timeout)
-    assert_equal(120, @client.send_timeout)
-    assert_equal(60, @client.receive_timeout)
-  end
-
-  def test_connect_timeout
-    # ToDo
-  end
-
-  def test_send_timeout
-    # ToDo
-  end
-
-  def test_receive_timeout
-    # this test takes 2 sec
-    assert_equal('hello', @client.get_content(serverurl + 'sleep?sec=2'))
-    @client.receive_timeout = 1
-    assert_equal('hello', @client.get_content(serverurl + 'sleep?sec=0'))
-    assert_raise(HTTPClient::ReceiveTimeoutError) do
-      @client.get_content(serverurl + 'sleep?sec=2')
-    end
-    @client.receive_timeout = 3
-    assert_equal('hello', @client.get_content(serverurl + 'sleep?sec=2'))
-  end
-
-  def test_cookies
-    cookiefile = File.join(File.dirname(File.expand_path(__FILE__)),
-      'test_cookies_file')
-    # from [ruby-talk:164079]
-    File.open(cookiefile, "wb") do |f|
-      f << "http://rubyforge.org//account/login.php	session_ser	LjEwMy45Ni40Ni0q%2A-fa0537de8cc31	1131676286	.rubyforge.org	/	13\n"
-    end
-    cm = WebAgent::CookieManager::new(cookiefile)
-    cm.load_cookies
-    cookie = cm.cookies.first
-    url = cookie.url
-    assert(cookie.domain_match(url.host, cookie.domain))
-  end
-
-private
-
-  def check_query_get(query)
-    WEBrick::HTTPUtils.parse_query(
-      @client.get(serverurl + 'servlet', query).header["x-query"][0]
-    )
-  end
-
-  def check_query_post(query)
-    WEBrick::HTTPUtils.parse_query(
-      @client.post(serverurl + 'servlet', query).header["x-query"][0]
-    )
-  end
-
-  def setup_server
-    @server = WEBrick::HTTPServer.new(
-      :BindAddress => "localhost",
-      :Logger => @logger,
-      :Port => 0,
-      :AccessLog => [],
-      :DocumentRoot => File.dirname(File.expand_path(__FILE__))
-    )
-    @serverport = @server.config[:Port]
-    [:hello, :sleep, :redirect1, :redirect2, :redirect3, :redirect_self, :relative_redirect].each do |sym|
-      @server.mount(
-	"/#{sym}",
-	WEBrick::HTTPServlet::ProcHandler.new(method("do_#{sym}").to_proc)
-      )
-    end
-    @server.mount('/servlet', TestServlet.new(@server))
-    @server_thread = start_server_thread(@server)
-  end
-
-  def escape_noproxy
-    backup = HTTPAccess2::Client::NO_PROXY_HOSTS.dup
-    HTTPAccess2::Client::NO_PROXY_HOSTS.clear
-    yield
-  ensure
-    HTTPAccess2::Client::NO_PROXY_HOSTS.replace(backup)
-  end
-
-  def do_hello(req, res)
-    res['content-type'] = 'text/html'
-    res.body = "hello"
-  end
-
-  def do_sleep(req, res)
-    sec = req.query['sec'].to_i
-    sleep sec
-    res['content-type'] = 'text/html'
-    res.body = "hello"
-  end
-
-  def do_redirect1(req, res)
-    res.set_redirect(WEBrick::HTTPStatus::MovedPermanently, serverurl + "hello") 
-  end
-
-  def do_redirect2(req, res)
-    res.set_redirect(WEBrick::HTTPStatus::TemporaryRedirect, serverurl + "redirect3")
-  end
-
-  def do_redirect3(req, res)
-    res.set_redirect(WEBrick::HTTPStatus::Found, serverurl + "hello") 
-  end
-
-  def do_redirect_self(req, res)
-    res.set_redirect(WEBrick::HTTPStatus::Found, serverurl + "redirect_self") 
-  end
-
-  def do_relative_redirect(req, res)
-    res.set_redirect(WEBrick::HTTPStatus::Found, "hello") 
-  end
-
-  class TestServlet < WEBrick::HTTPServlet::AbstractServlet
-    def get_instance(*arg)
-      self
-    end
-
-    def do_HEAD(req, res)
-      res["x-head"] = 'head'	# use this for test purpose only.
-      res["x-query"] = query_response(req)
-    end
-
-    def do_GET(req, res)
-      res.body = 'get'
-      res["x-query"] = query_response(req)
-    end
-
-    def do_POST(req, res)
-      res.body = 'post'
-      res["x-query"] = body_response(req)
-    end
-
-    def do_PUT(req, res)
-      res.body = 'put'
-    end
-
-    def do_DELETE(req, res)
-      res.body = 'delete'
-    end
-
-    def do_OPTIONS(req, res)
-      # check RFC for legal response.
-      res.body = 'options'
-    end
-
-    def do_TRACE(req, res)
-      # client SHOULD reflect the message received back to the client as the
-      # entity-body of a 200 (OK) response. [RFC2616]
-      res.body = 'trace'
-      res["x-query"] = query_response(req)
-    end
-
-  private
-
-    def query_response(req)
-      query_escape(WEBrick::HTTPUtils.parse_query(req.query_string))
-    end
-
-    def body_response(req)
-      query_escape(WEBrick::HTTPUtils.parse_query(req.body))
-    end
-
-    def query_escape(query)
-      escaped = []
-      query.collect do |k, v|
-	v.to_ary.each do |ve|
-	  escaped << CGI.escape(k) + '=' + CGI.escape(ve)
-	end
-      end
-      escaped.join('&')
-    end
-  end
-end
-
-
-end