]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Prevent force_encoding when it's not supported (like hashes)
authorAki Tuomi <cmouse@desteem.org>
Fri, 30 May 2014 12:59:43 +0000 (15:59 +0300)
committerAki Tuomi <cmouse@desteem.org>
Fri, 30 May 2014 12:59:43 +0000 (15:59 +0300)
modules/remotebackend/regression-tests/dnsbackend.rb

index aea993f82fbda2f12e4f3086a04920cc9a7a911c..6ce2e5a6fa24d20505a2fe5cb9dbfd7c70a1b263 100644 (file)
@@ -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}"