Merge branch 'master' of github.com:unbit/uwsgi

This commit is contained in:
Unbit
2013-09-02 15:55:27 +02:00
+2 -2
View File
@@ -378,9 +378,9 @@ class harakiri(object):
def __init__(self, seconds):
self.s = seconds
def real_call(self, *args):
def real_call(self, *args, **kwargs):
uwsgi.set_user_harakiri(self.s)
r = self.f(*args)
r = self.f(*args, **kwargs)
uwsgi.set_user_harakiri(0)
return r