From: Kenneth Reitz <me@kennethreitz.com>
Date: Wed, 17 Aug 2011 06:49:29 +0000 (-0400)
Subject: merge headers, don't overwrite
X-Git-Tag: v0.6.0~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7307298d28a30ed893d095338a36f7f62a7f1b9;p=services%2Fpython-requests.git

merge headers, don't overwrite
---

diff --git a/requests/sessions.py b/requests/sessions.py
index 540089c..50b09f6 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -67,6 +67,9 @@ class Session(object):
                         inst_attrs['cookies'], kwargs['cookies']
                     )
 
+                if kwargs.get('headers', None) and inst_attrs.get('headers', None):
+                    kwargs['headers'].update(inst_attrs['headers'])
+
                 return func(*args, **kwargs)
             return wrapper_func