saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8

Browse source
This commit is contained in:
Colton Myers 2015-11-09 15:28:14 -07:00
commit 2d04ddc108
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/netapi/rest_tornado/saltnado.py
View file

@ -1612,7 +1612,12 @@ class WebhookSaltAPIHandler(SaltAPIHandler): # pylint: disable=W0223
ret = self.event.fire_event({
'post': self.raw_data,
'headers': self.request.headers,
# In Tornado >= v4.0.3, the headers come
# back as an HTTPHeaders instance, which
# is a dictionary. We must cast this as
# a dictionary in order for msgpack to
# serialize it.
'headers': dict(self.request.headers),
}, tag)
self.write(self.serialize({'success': ret}))