From: Aki Tuomi <cmouse@desteem.org>
Date: Fri, 30 May 2014 19:10:00 +0000 (+0300)
Subject: Move force_encoding to earlier position
X-Git-Tag: rec-3.6.0~19^2~15^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1442%2Fhead;p=thirdparty%2Fpdns.git

Move force_encoding to earlier position
---

diff --git a/modules/remotebackend/regression-tests/dnsbackend.rb b/modules/remotebackend/regression-tests/dnsbackend.rb
index 6ce2e5a6fa..de28ec9fa4 100644
--- a/modules/remotebackend/regression-tests/dnsbackend.rb
+++ b/modules/remotebackend/regression-tests/dnsbackend.rb
@@ -82,7 +82,7 @@ class DNSBackendHandler < WEBrick::HTTPServlet::AbstractServlet
      tmp = req.path[/dns\/(.*)/,1]
      return 400, "Bad request" if (tmp.nil?)
 
-     method, args = parse_url(tmp)
+     method, args = parse_url(tmp.force_encoding("UTF-8"))
 
      method = "do_#{method}"
     
@@ -105,7 +105,6 @@ class DNSBackendHandler < WEBrick::HTTPServlet::AbstractServlet
      end
 
      args = parse_arrays args
-     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}"