Mercurial > hg > webserver / file diff

--- a/src/server/daemon/httprequest.c	Mon Jul 01 18:05:13 2013 +0200
+++ b/src/server/daemon/httprequest.c	Mon Jul 08 11:10:54 2013 +0200
@@ -40,6 +40,7 @@
 #include "config.h"
 #include "vserver.h"
 #include "httplistener.h"
+#include "func.h"
 #include "error.h"
 
 void http_request_init(HTTPRequest *req) {
@@ -771,7 +772,7 @@
         return nsapi_exec_tp(d, sn, rq, sn->defaultpool);
     }
     
-    return d->func->func(d->param, (Session*)sn, (Request*)rq);
+    return SAF_EXEC(d->func, d->param, (Session*)sn, (Request*)rq);
 }
 
 int nsapi_exec_tp(
@@ -826,7 +827,8 @@
     struct _tpd_data *data = d;
     
     data->sn->currentpool = data->threadpool;
-    int r = data->directive->func->func(
+    int r = SAF_EXEC(
+            data->directive->func,
             data->directive->param,
             (Session*)data->sn,
             (Request*)data->rq);