httpclient 2.2.4 → 2.2.5

data/lib/hexdump.rb

@@ -1,8 +1,11 @@
+# encoding: binary
+
 # This was written by Arai-san and published at
 # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/31987
 
 
 module HexDump
+  # str must be in BINARY encoding in 1.9
   def encode(str)
     offset = 0
     result = []
@@ -21,7 +24,7 @@ module HexDump
       result << sprintf("%08x  %-36s  %s", offset, data, text)
       offset += 16
       # omit duplicate line
-      if /^(#{ Regexp.quote(raw) })+/n =~ str[offset .. -1]
+      if /^(#{regex_quote_n(raw)})+/n =~ str[offset .. -1]
 	result << sprintf("%08x  ...", offset)
 	offset += $&.length
 	# should print at the end
@@ -33,4 +36,15 @@ module HexDump
     result
   end
   module_function :encode
+
+  if RUBY_VERSION >= "1.9"
+    # raw must be in BINARY encoding in 1.9
+    def self.regex_quote_n(raw)
+      Regexp.quote(raw)
+    end
+  else
+    def self.regex_quote_n(raw)
+      Regexp.quote(raw, 'n')
+    end
+  end
 end

data/lib/httpclient.rb

@@ -65,7 +65,7 @@ require 'httpclient/cookie'
 #
 # 3. You can pass :follow_redirect option to follow redirect response in get.
 #
-#     puts clnt.get('http://dev.ctor.org/', :foolow_redirect => true)
+#     puts clnt.get('http://dev.ctor.org/', :follow_redirect => true)
 #
 # 4. Get content as chunks of String.  It yields chunks of String.
 #
@@ -198,7 +198,7 @@ require 'httpclient/cookie'
 #
 # Pass a Hash or an Array for header argument.
 #
-#     header = { 'Accept' => '*/*' }
+#     header = { 'Accept' => 'text/html' }
 #     clnt.get(uri, query, header)
 #
 #     header = [['Accept', 'image/jpeg'], ['Accept', 'image/png']]
@@ -562,7 +562,7 @@ class HTTPClient
   #         Give an array to pass multiple value like
   #         [["a", "b"], ["a", "c"]] => 'http://host/part?a=b&a=c'.
   # header:: a Hash or an Array of extra headers.  e.g.
-  #          { 'Accept' => '*/*' } or
+  #          { 'Accept' => 'text/html' } or
   #          [['Accept', 'image/jpeg'], ['Accept', 'image/png']].
   # &block:: Give a block to get chunked message-body of response like
   #          get_content(uri) { |chunked_body| ... }.
@@ -597,7 +597,7 @@ class HTTPClient
   #           { 'Content-Type' => 'video/mp4', :content => File.new('video.mp4') }]
   #          => <Two parts with custom Content-Type header>
   # header:: a Hash or an Array of extra headers. e.g.
-  #            { 'Accept' => '*/*' }
+  #            { 'Accept' => 'text/html' }
   #          or
   #            [['Accept', 'image/jpeg'], ['Accept', 'image/png']].
   # &block:: Give a block to get chunked message-body of response like
@@ -641,8 +641,8 @@ class HTTPClient
     newuri = URI.parse(res.header['location'][0])
     unless newuri.is_a?(URI::HTTP)
       newuri = uri + newuri
-      STDERR.puts("could be a relative URI in location header which is not recommended")
-      STDERR.puts("'The field value consists of a single absolute URI' in HTTP spec")
+      warn("could be a relative URI in location header which is not recommended")
+      warn("'The field value consists of a single absolute URI' in HTTP spec")
     end
     if https?(uri) && !https?(newuri)
       raise BadResponseError.new("redirecting to non-https resource")
@@ -721,7 +721,7 @@ class HTTPClient
   #          => <Two parts with custom Content-Type header>
   #        See HTTP::Message.file? for actual condition of 'a file'.
   # header:: a Hash or an Array of extra headers.  e.g.
-  #          { 'Accept' => '*/*' } or
+  #          { 'Accept' => 'text/html' } or
   #          [['Accept', 'image/jpeg'], ['Accept', 'image/png']].
   # &block:: Give a block to get chunked message-body of response like
   #          get(uri) { |chunked_body| ... }.
@@ -996,7 +996,7 @@ private
     end
     req = HTTP::Message.new_request(method, uri, query, body, boundary)
     header.each do |key, value|
-      req.header.add(key, value)
+      req.header.add(key.to_s, value)
     end
     if @cookie_manager && cookie = @cookie_manager.find(uri)
       req.header.add('Cookie', cookie)

data/lib/httpclient/http.rb

@@ -7,7 +7,9 @@
 
 
 require 'time'
-require 'open-uri' # for encoding
+if defined?(Encoding::ASCII_8BIT)
+  require 'open-uri' # for encoding
+end
 
 
 # A namespace module for HTTP Message definitions used by HTTPClient.
@@ -256,6 +258,11 @@ module HTTP
         }.join
       end
 
+      # Set Date header
+      def set_date_header
+        set('Date', Time.now.httpdate)
+      end
+
       # Adds a header.  Addition order is preserved.
       def add(key, value)
         if value.is_a?(Array)
@@ -392,7 +399,7 @@ module HTTP
         return if @dumped
         @dumped = true
         if defined?(Apache) && self['Date'].empty?
-          set('Date', Time.now.httpdate)
+          set_date_header
         end
         keep_alive = Message.keep_alive_enabled?(@http_version)
         if @chunked
@@ -525,7 +532,7 @@ module HTTP
     private
 
       def set_content(body, boundary = nil)
-        if body.respond_to?(:read)
+        if Message.file?(body)
           # uses Transfer-Encoding: chunked if body does not respond to :size.
           # bear in mind that server may not support it. at least ruby's CGI doesn't.
           @body = body
@@ -588,14 +595,14 @@ module HTTP
           if Message.file?(part)
             @as_stream = true
             @body << part
-            if part.respond_to?(:size)
+            if part.respond_to?(:lstat)
+              @size += part.lstat.size
+            elsif part.respond_to?(:size)
               if sz = part.size
                 @size += sz
               else
                 @size = nil
               end
-            elsif part.respond_to?(:lstat)
-              @size += part.lstat.size
             else
               # use chunked upload
               @size = nil

data/lib/httpclient/session.rb

@@ -717,10 +717,15 @@ class HTTPClient
       if @from
         req.header.set('From', @from)
       end
+      if req.header.get('Accept').empty?
+        req.header.set('Accept', '*/*')
+      end
       if @transparent_gzip_decompression
         req.header.set('Accept-Encoding', 'gzip,deflate')
       end
-      req.header.set('Date', Time.now.httpdate)
+      if req.header.get('Date').empty?
+        req.header.set_date_header
+      end
     end
 
     # Connect to the server
@@ -808,7 +813,7 @@ class HTTPClient
       parse_header
       res.http_version, res.status, res.reason = @version, @status, @reason
       @headers.each do |key, value|
-        res.header.set(key, value)
+        res.header.set(key.to_s, value)
       end
       commands = @client.request_filter.collect { |filter|
         filter.filter_response(req, res)

data/lib/httpclient/ssl_config.rb

@@ -33,6 +33,8 @@ class HTTPClient
   class SSLConfig
     include OpenSSL if SSLEnabled
 
+    # String name of OpenSSL's SSL version method name: SSLv2, SSLv23 or SSLv3
+    attr_reader :ssl_version
     # OpenSSL::X509::Certificate:: certificate for SSL client authenticateion.
     # nil by default. (no client authenticateion)
     attr_reader :client_cert
@@ -80,11 +82,21 @@ class HTTPClient
       @verify_callback = nil
       @dest = nil
       @timeout = nil
+      # TODO: change to "SSLv3" in future versions to make harder to use SSLv2.
+      @ssl_version = "SSLv23"
       @options = defined?(SSL::OP_ALL) ? SSL::OP_ALL | SSL::OP_NO_SSLv2 : nil
-      @ciphers = "ALL:!ADH:!LOW:!EXP:!MD5:+SSLv2:@STRENGTH"
+      # OpenSSL 0.9.8 default: "ALL:!ADH:!LOW:!EXP:!MD5:+SSLv2:@STRENGTH"
+      @ciphers = "ALL:!aNULL:!eNULL:!SSLv2" # OpenSSL >1.0.0 default
       @cacerts_loaded = false
     end
 
+    # Sets SSL version method String.  Possible values: "SSLv2" for SSL2,
+    # "SSLv3" for SSL3 and TLS1.x, "SSLv23" for SSL3 with fallback to SSL2.
+    def ssl_version=(ssl_version)
+      @ssl_version = ssl_version
+      change_notify
+    end
+
     # Sets certificate (OpenSSL::X509::Certificate) for SSL client
     # authentication.
     # client_key and client_cert must be a pair.
@@ -117,6 +129,24 @@ class HTTPClient
       change_notify
     end
 
+    # Sets OpenSSL's default trusted CA certificates.  Generally, OpenSSL is
+    # configured to use OS's trusted CA certificates located at
+    # /etc/pki/certs or /etc/ssl/certs.  Unfortunately OpenSSL's Windows build
+    # does not work with Windows Certificate Storage.
+    #
+    # On Windows or when you build OpenSSL manually, you can set the
+    # CA certificates directory by SSL_CERT_DIR env variable at runtime.
+    #
+    #   SSL_CERT_DIR=/etc/ssl/certs ruby -rhttpclient -e "..."
+    #
+    # Calling this method resets all existing sessions.
+    def set_default_paths
+      @cacerts_loaded = true # avoid lazy override
+      @cert_store = X509::Store.new
+      @cert_store.set_default_paths
+      change_notify
+    end
+
     # Drops current certificate store (OpenSSL::X509::Store) for SSL and create
     # new one for the next session.
     #
@@ -253,6 +283,7 @@ class HTTPClient
       ctx.timeout = @timeout
       ctx.options = @options
       ctx.ciphers = @ciphers
+      ctx.ssl_version = @ssl_version
     end
 
     # post connection check proc for ruby < 1.8.5.
@@ -287,7 +318,13 @@ class HTTPClient
     # Default callback for verification: only dumps error.
     def default_verify_callback(is_ok, ctx)
       if $DEBUG
-        warn("#{ is_ok ? 'ok' : 'ng' }: #{ctx.current_cert.subject}")
+        if is_ok
+          warn("ok: #{ctx.current_cert.subject.to_s.dump}")
+        else
+          warn("ng: #{ctx.current_cert.subject.to_s.dump} at depth #{ctx.error_depth} - #{ctx.error}: #{ctx.error_string} in #{ctx.chain.inspect}")
+        end
+        warn(ctx.current_cert.to_text)
+        warn(ctx.current_cert.to_pem)
       end
       if !is_ok
         depth = ctx.error_depth

data/lib/httpclient/version.rb

@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '2.2.4'
+  VERSION = '2.2.5'
 end

data/test/ca-chain.cert

@@ -0,0 +1,44 @@
+-----BEGIN CERTIFICATE-----
+MIID0DCCArigAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MQswCQYDVQQGDAJKUDES
+MBAGA1UECgwJSklOLkdSLkpQMQwwCgYDVQQLDANSUlIxCzAJBgNVBAMMAkNBMB4X
+DTA0MDEzMDAwNDIzMloXDTM2MDEyMjAwNDIzMlowPDELMAkGA1UEBgwCSlAxEjAQ
+BgNVBAoMCUpJTi5HUi5KUDEMMAoGA1UECwwDUlJSMQswCQYDVQQDDAJDQTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANbv0x42BTKFEQOE+KJ2XmiSdZpR
+wjzQLAkPLRnLB98tlzs4xo+y4RyY/rd5TT9UzBJTIhP8CJi5GbS1oXEerQXB3P0d
+L5oSSMwGGyuIzgZe5+vZ1kgzQxMEKMMKlzA73rbMd4Jx3u5+jdbP0EDrPYfXSvLY
+bS04n2aX7zrN3x5KdDrNBfwBio2/qeaaj4+9OxnwRvYP3WOvqdW0h329eMfHw0pi
+JI0drIVdsEqClUV4pebT/F+CPUPkEh/weySgo9wANockkYu5ujw2GbLFcO5LXxxm
+dEfcVr3r6t6zOA4bJwL0W/e6LBcrwiG/qPDFErhwtgTLYf6Er67SzLyA66UCAwEA
+AaOB3DCB2TAPBgNVHRMBAf8EBTADAQH/MDEGCWCGSAGG+EIBDQQkFiJSdWJ5L09w
+ZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRJ7Xd380KzBV7f
+USKIQ+O/vKbhDzAOBgNVHQ8BAf8EBAMCAQYwZAYDVR0jBF0wW4AUSe13d/NCswVe
+31EiiEPjv7ym4Q+hQKQ+MDwxCzAJBgNVBAYMAkpQMRIwEAYDVQQKDAlKSU4uR1Iu
+SlAxDDAKBgNVBAsMA1JSUjELMAkGA1UEAwwCQ0GCAQAwDQYJKoZIhvcNAQEFBQAD
+ggEBAIu/mfiez5XN5tn2jScgShPgHEFJBR0BTJBZF6xCk0jyqNx/g9HMj2ELCuK+
+r/Y7KFW5c5M3AQ+xWW0ZSc4kvzyTcV7yTVIwj2jZ9ddYMN3nupZFgBK1GB4Y05GY
+MJJFRkSu6d/Ph5ypzBVw2YMT/nsOo5VwMUGLgS7YVjU+u/HNWz80J3oO17mNZllj
+PvORJcnjwlroDnS58KoJ7GDgejv3ESWADvX1OHLE4cRkiQGeLoEU4pxdCxXRqX0U
+PbwIkZN9mXVcrmPHq8MWi4eC/V7hnbZETMHuWhUoiNdOEfsAXr3iP4KjyyRdwc7a
+d/xgcK06UVQRL/HbEYGiQL056mc=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA8MQswCQYDVQQGDAJKUDES
+MBAGA1UECgwJSklOLkdSLkpQMQwwCgYDVQQLDANSUlIxCzAJBgNVBAMMAkNBMB4X
+DTA0MDEzMDAwNDMyN1oXDTM1MDEyMjAwNDMyN1owPzELMAkGA1UEBgwCSlAxEjAQ
+BgNVBAoMCUpJTi5HUi5KUDEMMAoGA1UECwwDUlJSMQ4wDAYDVQQDDAVTdWJDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ0Ou7AyRcRXnB/kVHv/6kwe
+ANzgg/DyJfsAUqW90m7Lu1nqyug8gK0RBd77yU0w5HOAMHTVSdpjZK0g2sgx4Mb1
+d/213eL9TTl5MRVEChTvQr8q5DVG/8fxPPE7fMI8eOAzd98/NOAChk+80r4Sx7fC
+kGVEE1bKwY1MrUsUNjOY2d6t3M4HHV3HX1V8ShuKfsHxgCmLzdI8U+5CnQedFgkm
+3e+8tr8IX5RR1wA1Ifw9VadF7OdI/bGMzog/Q8XCLf+WPFjnK7Gcx6JFtzF6Gi4x
+4dp1Xl45JYiVvi9zQ132wu8A1pDHhiNgQviyzbP+UjcB/tsOpzBQF8abYzgEkWEC
+AwEAAaNyMHAwDwYDVR0TAQH/BAUwAwEB/zAxBglghkgBhvhCAQ0EJBYiUnVieS9P
+cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUlCjXWLsReYzH
+LzsxwVnCXmKoB/owCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQCJ/OyN
+rT8Cq2Y+G2yA/L1EMRvvxwFBqxavqaqHl/6rwsIBFlB3zbqGA/0oec6MAVnYynq4
+c4AcHTjx3bQ/S4r2sNTZq0DH4SYbQzIobx/YW8PjQUJt8KQdKMcwwi7arHP7A/Ha
+LKu8eIC2nsUBnP4NhkYSGhbmpJK+PFD0FVtD0ZIRlY/wsnaZNjWWcnWF1/FNuQ4H
+ySjIblqVQkPuzebv3Ror6ZnVDukn96Mg7kP4u6zgxOeqlJGRe1M949SS9Vudjl8X
+SF4aZUUB9pQGhsqQJVqaz2OlhGOp9D0q54xko/rekjAIcuDjl1mdX4F2WRrzpUmZ
+uY/bPeOBYiVsOYVe
+-----END CERTIFICATE-----

data/test/helper.rb

@@ -1,5 +1,10 @@
 # -*- encoding: utf-8 -*-
 require 'test/unit'
+require 'simplecov'
+require 'simplecov-rcov'
+SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+SimpleCov.start
+
 require 'httpclient'
 require 'webrick'
 require 'webrick/httpproxy.rb'
@@ -96,4 +101,26 @@ module Helper
     end
     t
   end
+
+  def params(str)
+    HTTP::Message.parse(str).inject({}) { |r, (k, v)| r[k] = v.first; r }
+  end
+
+  def silent
+    begin
+      back, $VERBOSE = $VERBOSE, nil
+      yield
+    ensure
+      $VERBOSE = back
+    end
+  end
+
+  def escape_env
+    env = {}
+    env.update(ENV)
+    yield
+  ensure
+    ENV.clear
+    ENV.update(env)
+  end
 end

data/test/test_auth.rb

@@ -39,15 +39,18 @@ class TestAuth < Test::Unit::TestCase
     htdigest = File.join(File.dirname(__FILE__), 'htdigest')
     htdigest_userdb = WEBrick::HTTPAuth::Htdigest.new(htdigest)
     @basic_auth = WEBrick::HTTPAuth::BasicAuth.new(
+      :Logger => @logger,
       :Realm => 'auth',
       :UserDB => htpasswd_userdb
     )
     @digest_auth = WEBrick::HTTPAuth::DigestAuth.new(
+      :Logger => @logger,
       :Algorithm => 'MD5',
       :Realm => 'auth',
       :UserDB => htdigest_userdb
     )
     @digest_sess_auth = WEBrick::HTTPAuth::DigestAuth.new(
+      :Logger => @logger,
       :Algorithm => 'MD5-sess',
       :Realm => 'auth',
       :UserDB => htdigest_userdb
@@ -177,7 +180,7 @@ class TestAuth < Test::Unit::TestCase
     c.www_auth.oauth.challenge('http://photos.example.net/')
     c.test_loopback_http_response << "HTTP/1.0 200 OK\nContent-Length: 2\n\nOK"
     c.debug_dev = str = ''
-    c.get_content('http://photos.example.net/photos', :file => 'vacation.jpg', :size => 'original')
+    c.get_content('http://photos.example.net/photos', [[:file, 'vacation.jpg'], [:size, 'original']])
     assert(str.index(%q(GET /photos?file=vacation.jpg&size=original)))
     assert(str.index(%q(Authorization: OAuth realm="http://photos.example.net/", oauth_consumer_key="dpf43f3p2l4k3l03", oauth_nonce="kllo9940pd9333jh", oauth_signature="tR3%2BTy81lMeYAr%2FFid0kMTYa%2FWM%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1191242096", oauth_token="nnch734d00sl2jdk", oauth_version="1.0")))
     #
@@ -189,7 +192,7 @@ class TestAuth < Test::Unit::TestCase
     #
     c.test_loopback_http_response << "HTTP/1.0 200 OK\nContent-Length: 2\n\nOK"
     c.debug_dev = str = ''
-    c.post_content('http://photos.example.net/photos', :file => 'vacation.jpg', :size => 'original')
+    c.post_content('http://photos.example.net/photos', [[:file, 'vacation.jpg'], [:size, 'original']])
     assert(str.index(%q(POST /photos)))
     assert(str.index(%q(Authorization: OAuth realm="http://photos.example.net/", oauth_consumer_key="dpf43f3p2l4k3l03", oauth_nonce="kllo9940pd9333jh", oauth_signature="wPkvxykrw%2BBTdCcGqKr%2B3I%2BPsiM%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1191242096", oauth_token="nnch734d00sl2jdk", oauth_version="1.0")))
   end

data/test/test_hexdump.rb

@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('helper', File.dirname(__FILE__))
+require 'hexdump'
+
+
+class TestHexDump < Test::Unit::TestCase
+  def test_encode
+    str = "\032l\277\370\2429\216\236\351[{\{\262\350\274\376"
+    str.force_encoding('BINARY') if str.respond_to?(:force_encoding)
+    assert_equal(["00000000  1a6cbff8 a2398e9e e95b7b7b b2e8bcfe   .l...9...[{{...."], HexDump.encode(str))
+  end
+end if defined?(RUBY_ENGINE) && RUBY_ENGINE != "rbx" && RUBY_VERSION >= "1.9.0"
+# Rubinius 1.8 mode does not support Regexp.quote(raw, 'n')  I don't want put
+# a pressure on supporting it because 1.9 mode works fine.

data/test/test_http-access2.rb

@@ -80,8 +80,8 @@ class TestClient < Test::Unit::TestCase
     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[5])
-    assert_equal("= Response", lines[6])
+    assert_equal("Connection: close", lines[6])
+    assert_equal("= Response", lines[7])
   end
 
   def test_protocol_version_http11
@@ -92,7 +92,7 @@ class TestClient < Test::Unit::TestCase
     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[5])
+    assert_equal("Host: localhost:#{serverport}", lines[6])
     @client.protocol_version = 'HTTP/1.1'
     str = ""
     @client.debug_dev = str
@@ -227,44 +227,51 @@ class TestClient < Test::Unit::TestCase
 
   def test_head
     assert_equal("head", @client.head(serverurl + 'servlet').header["x-head"][0])
-    res = @client.head(serverurl + 'servlet', {1=>2, 3=>4})
-    assert_equal('1=2&3=4', res.header["x-query"][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)
-    res = @client.get(serverurl + 'servlet', {1=>2, 3=>4})
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    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)
-    res = @client.get(serverurl + 'servlet', {1=>2, 3=>4})
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    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)
-    res = @client.get(serverurl + 'servlet', {1=>2, 3=>4})
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    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)
-    res = @client.get(serverurl + 'servlet', {1=>2, 3=>4})
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    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)
-    res = @client.get(serverurl + 'servlet', {1=>2, 3=>4})
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    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)
-    res = @client.get(serverurl + 'servlet', {1=>2, 3=>4})
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    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