fix decode preference, cleanup pass_cookies

mathieuravaux · May 23, 2011 · ddfb713 · ddfb713
1 parent b223b47
commit ddfb713
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/em-http/http_client_options.rb b/lib/em-http/http_client_options.rb
@@ -9,7 +9,6 @@ def initialize(uri, options, method)
     @keepalive = options[:keepalive] || false  # default to single request per connection
     @redirects = options[:redirects] ||= 0     # default number of redirects to follow
     @followed  = options[:followed]  ||= 0     # keep track of number of followed requests
-    @decoding  = options[:decoding]  || true   # auto-decode compressed response
 
     @method   = method.to_s.upcase
     @headers  = options[:head]  || {}
@@ -20,8 +19,8 @@ def initialize(uri, options, method)
     @file     = options[:file]
     @body     = options[:body]
 
-    @pass_cookies = options[:pass_cookies]
-    @pass_cookies = true if @pass_cookies.nil?
+    @pass_cookies = options.fetch(:pass_cookies, true)  # pass cookies between redirects
+    @decoding     = options.fetch(:decoding, true)      # auto-decode compressed response
 
     set_uri(uri)
   end