From dc35fc06fa3bdce9c22954508e2f1ca6bec62ee5 Mon Sep 17 00:00:00 2001 From: John Whitson Date: Wed, 24 May 2017 14:25:07 -0600 Subject: [PATCH] Default headers should be overridable --- lib/unirest.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/unirest.rb b/lib/unirest.rb index ce5e8e2..ab1b1a8 100644 --- a/lib/unirest.rb +++ b/lib/unirest.rb @@ -100,23 +100,23 @@ def self.user_agent(user_agent=@@user_agent) end def self.get(url, headers: {}, parameters: nil, auth:nil, &callback) - HttpClient.request(:get, url, headers.merge(@@default_headers), parameters, auth, @@timeout, &callback) + HttpClient.request(:get, url, @@default_headers.merge(headers), parameters, auth, @@timeout, &callback) end def self.post(url, headers: {}, parameters: nil, auth:nil, &callback) - HttpClient.request(:post, url, headers.merge(@@default_headers), parameters, auth, @@timeout, &callback) + HttpClient.request(:post, url, @@default_headers.merge(headers), parameters, auth, @@timeout, &callback) end def self.delete(url, headers: {}, parameters: nil, auth:nil, &callback) - HttpClient.request(:delete, url, headers.merge(@@default_headers), parameters, auth, @@timeout, &callback) + HttpClient.request(:delete, url, @@default_headers.merge(headers), parameters, auth, @@timeout, &callback) end def self.put(url, headers: {}, parameters: nil, auth:nil, &callback) - HttpClient.request(:put, url, headers.merge(@@default_headers), parameters, auth, @@timeout, &callback) + HttpClient.request(:put, url, @@default_headers.merge(headers), parameters, auth, @@timeout, &callback) end def self.patch(url, headers: {}, parameters: nil, auth:nil, &callback) - HttpClient.request(:patch, url, headers.merge(@@default_headers), parameters, auth, @@timeout, &callback) + HttpClient.request(:patch, url, @@default_headers.merge(headers), parameters, auth, @@timeout, &callback) end -end \ No newline at end of file +end