From: Aki Tuomi <cmouse@desteem.org>
Date: Fri, 30 May 2014 12:59:43 +0000 (+0300)
Subject: Prevent force_encoding when it's not supported (like hashes)
X-Git-Tag: rec-3.6.0~19^2~15^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60377ddc42c87f6547852fc1928b9e23f7141e77;p=thirdparty%2Fpdns.git

Prevent force_encoding when it's not supported (like hashes)
---

diff --git a/modules/remotebackend/regression-tests/dnsbackend.rb b/modules/remotebackend/regression-tests/dnsbackend.rb
index aea993f82f..6ce2e5a6fa 100644
--- a/modules/remotebackend/regression-tests/dnsbackend.rb
+++ b/modules/remotebackend/regression-tests/dnsbackend.rb
@@ -90,7 +90,7 @@ class DNSBackendHandler < WEBrick::HTTPServlet::AbstractServlet
      req.each do |k,v|
         attr = k[/x-remotebackend-(.*)/i,1]
         if attr 
-          args[attr.downcase] = v
+          args[attr.downcase] = v.force_encoding("UTF-8")
         end
      end
 
@@ -105,7 +105,7 @@ class DNSBackendHandler < WEBrick::HTTPServlet::AbstractServlet
      end
 
      args = parse_arrays args
-     args.map { |name,arg| arg = arg.force_encoding("UTF-8") }
+     args.map do |name,arg| if (arg.respond_to? :force_encoding) then arg = arg.force_encoding("UTF-8") end end
  
      @@f.puts "#{Time.now.to_f} [http]: #{({:method=>method,:parameters=>args}).to_json}"