excon 0.3.1 → 0.3.2

data/excon.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.3.1'
+  s.version           = '0.3.2'
   s.date              = '2010-12-09'
   s.rubyforge_project = 'excon'
 

data/lib/excon.rb

@@ -13,7 +13,7 @@ require 'excon/response'
 module Excon
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 
   unless const_defined?(:CHUNK_SIZE)

data/lib/excon/connection.rb

@@ -44,7 +44,7 @@ module Excon
       begin
         # connection has defaults, merge in new params to override
         params = @connection.merge(params)
-        params[:headers] = @connection[:headers].merge(params[:headers])
+        params[:headers] = @connection[:headers].merge(params[:headers] || {})
 
         # if path is empty or doesn't start with '/', insert one
         unless params[:path][0..0] == '/'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - geemus (Wesley Beary)