From 39d5e6729ba0838ff28d09b0afa85c8fd1c2edee Mon Sep 17 00:00:00 2001 From: James Rose Date: Fri, 27 Apr 2012 14:08:24 +0100 Subject: [PATCH] Still wrong. --- lib/fog/serverlove/compute.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/fog/serverlove/compute.rb b/lib/fog/serverlove/compute.rb index 101b20145..8b7f2ffc9 100644 --- a/lib/fog/serverlove/compute.rb +++ b/lib/fog/serverlove/compute.rb @@ -35,7 +35,12 @@ module Fog end def request(params) - params = params.merge!({:host => @api_url}).merge!(header_for_basic_auth) + params = params.merge!( + :headers => { + "Authorization" => "Basic #{Base64.encode64("#{@api_uuid}:#{@api_key}").chomp!}", + }, + :host => @api_url + ) response = @connection.request(params) raise_if_error!(response) @@ -45,11 +50,6 @@ module Fog response end - def header_for_basic_auth - { - "Authorization" => "Basic #{Base64.encode64("#{@api_uuid}:#{@api_key}").delete("\r\n")}", - } - end def raise_if_error!(response) case response.status