make function afb_context_set return a status

[src/app-framework-binder.git] / src / afb-hsrv.c

diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c
index 91dff29..87895a7 100644 (file)
--- a/src/afb-hsrv.c
+++ b/src/afb-hsrv.c
@@ -31,6 +31,7 @@
 
 #include "afb-method.h"
 #include "afb-context.h"
+#include "afb-xreq.h"
 #include "afb-hreq.h"
 #include "afb-hsrv.h"
 #include <afb/afb-req-itf.h>
@@ -39,8 +40,6 @@
 
 #include "afb-common.h"
 
-
-
 #define JSON_CONTENT  "application/json"
 #define FORM_CONTENT  MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA
 
@@ -68,8 +67,6 @@ struct afb_hsrv {
        char *cache_to;
 };
 
-static int global_reqids = 0;
-
 static void reply_error(struct MHD_Connection *connection, unsigned int status)
 {
        struct MHD_Response *response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
@@ -124,7 +121,7 @@ static int access_handler(
                }
 
                /* create the request */
-               hreq = calloc(1, sizeof *hreq);
+               hreq = afb_hreq_create();
                if (hreq == NULL) {
                        ERROR("Can't allocate 'hreq'");
                        reply_error(connection, MHD_HTTP_INTERNAL_SERVER_ERROR);
@@ -132,13 +129,8 @@ static int access_handler(
                }
 
                /* init the request */
-               hreq->refcount = 1;
                hreq->hsrv = hsrv;
                hreq->cacheTimeout = hsrv->cache_to;
-               hreq->reqid = ++global_reqids;
-               hreq->scanned = 0;
-               hreq->suspended = 0;
-               hreq->replied = 0;
                hreq->connection = connection;
                hreq->method = method;
                hreq->version = version;
@@ -238,9 +230,9 @@ static void end_handler(void *cls, struct MHD_Connection *connection, void **rec
        struct afb_hreq *hreq;
 
        hreq = *recordreq;
-       if (hreq->upgrade)
-               MHD_suspend_connection (connection);
-       afb_hreq_unref(hreq);
+       if (hreq) {
+               afb_hreq_unref(hreq);
+       }
 }
 
 void run_micro_httpd(struct afb_hsrv *hsrv)
@@ -405,7 +397,7 @@ int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection
        const union MHD_DaemonInfo *info;
 
        httpd = MHD_start_daemon(
-               MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME,
+               MHD_USE_EPOLL | MHD_ALLOW_UPGRADE | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME,
                port,                           /* port */
                new_client_handler, NULL,       /* Tcp Accept call back + extra attribute */
                access_handler, hsrv,   /* Http Request Call back + extra attribute */