Merge pull request #481 from PericlesTheo/simplify_set_defaults

Simplify Request#set_defaults
typhoeus · Oct 5, 2015 · ba29c7a · ba29c7a
2 parents 01995fa + 3641a18
commit ba29c7a
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/lib/typhoeus/request.rb b/lib/typhoeus/request.rb
@@ -211,13 +211,9 @@ def hashable_string_for(obj)
     def set_defaults
       default_user_agent = Config.user_agent || Typhoeus::USER_AGENT
 
-      if @options[:headers]
-        @options[:headers] = {'User-Agent' => default_user_agent}.merge(options[:headers])
-      else
-        @options[:headers] = {'User-Agent' => default_user_agent}
-      end
-      @options[:verbose] = Typhoeus::Config.verbose if @options[:verbose].nil? && !Typhoeus::Config.verbose.nil?
-      @options[:maxredirs] ||= 50
+      options[:headers] = {'User-Agent' => default_user_agent}.merge(options[:headers] || {})
+      options[:verbose] = Typhoeus::Config.verbose if options[:verbose].nil? && !Typhoeus::Config.verbose.nil?
+      options[:maxredirs] ||= 50
     end
   end
 end