lib/savon/request.rb in savon-2.11.1 vs lib/savon/request.rb in savon-2.11.2
- old
+ new
@@ -70,13 +70,13 @@
2 => "application/soap+xml;charset=%s"
}
def build(options = {})
configure_proxy
- configure_cookies options[:cookies]
configure_timeouts
- configure_headers options[:soap_action]
+ configure_headers options[:soap_action], options[:headers]
+ configure_cookies options[:cookies]
configure_ssl
configure_auth
configure_redirect_handling
@http_request
@@ -86,11 +86,12 @@
def configure_cookies(cookies)
@http_request.set_cookies(cookies) if cookies
end
- def configure_headers(soap_action)
+ def configure_headers(soap_action, headers)
@http_request.headers = @globals[:headers] if @globals.include? :headers
+ @http_request.headers.merge!(headers) if headers
@http_request.headers["SOAPAction"] ||= %{"#{soap_action}"} if soap_action
@http_request.headers["Content-Type"] ||= CONTENT_TYPE[@globals[:soap_version]] % @globals[:encoding]
end
end
end