Merge lp:~gmludo/txjsonrpc/txjsonrpc into lp:txjsonrpc

[Gasc Ludovic]

Add additional_http_headers property in JSONRPC to add easily a custom http header, for example with CORS (Access-Control-Allow-Origin).

[Gasc Ludovic (gmludo)]

Somebody could review this patch ?

Thank you.

[Duncan McGreggor (oubiwann)]

Hey, sorry about that.

One tiny comment: instead of "self.__dict__.has_key", let's do "vars(self).has_key"

Other than that, looks good!

[lp:~gmludo/txjsonrpc/txjsonrpc]

96. By Gasc Ludovic on 2014-02-18

change self.__dict__ to vars(self)

[Gasc Ludovic (gmludo)]

It's done.

[Gasc Ludovic (gmludo)]

Somebody could merge this patch ?

Thank you.

[Duncan McGreggor (oubiwann)]

Looks good.

review: Approve

=== modified file 'txjsonrpc/web/jsonrpc.py'
--- txjsonrpc/web/jsonrpc.py	2012-01-28 01:11:15 +0000
+++ txjsonrpc/web/jsonrpc.py	2014-02-18 13:31:20 +0000
@@ -127,6 +127,9 @@
             f = jsonrpclib.Fault(self.FAILURE, "can't serialize output")
             s = jsonrpclib.dumps(f, version=version)
         request.setHeader("content-length", str(len(s)))
+        if vars(self).has_key('additional_http_headers'):
+            for header, value in self.additional_http_headers.items():
+                request.setHeader(str(header), str(value))
         request.write(s)
         request.finish()