adds accepted lang to global hreq

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

diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c
index e64c5c9..9d83838 100644 (file)
--- a/src/afb-hsrv.c
+++ b/src/afb-hsrv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2016 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,7 +33,7 @@
 #include "afb-context.h"
 #include "afb-hreq.h"
 #include "afb-hsrv.h"
-#include "afb-req-itf.h"
+#include <afb/afb-req-itf.h>
 #include "verbose.h"
 
 #include "afb-common.h"
@@ -58,6 +58,7 @@ struct hsrv_alias {
        const char *directory;
        size_t lendir;
        int dirfd;
+       int relax;
 };
 
 struct afb_hsrv {
@@ -141,6 +142,7 @@ static int access_handler(
                hreq->connection = connection;
                hreq->method = method;
                hreq->version = version;
+               hreq->lang = afb_hreq_get_header(hreq, MHD_HTTP_HEADER_ACCEPT_LANGUAGE);
                hreq->tail = hreq->url = url;
                hreq->lentail = hreq->lenurl = strlen(url);
                *recordreq = hreq;
@@ -156,7 +158,9 @@ static int access_handler(
                                if (hreq->postform == NULL)
                                        afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
                                return MHD_YES;
-                       } else if (strcasestr(type, JSON_CONTENT) == NULL) {
+                       } else if (strcasestr(type, JSON_CONTENT) != NULL) {
+                               return MHD_YES;
+                        } else {
                                afb_hreq_reply_error(hreq, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE);
                                return MHD_YES;
                        }
@@ -302,19 +306,30 @@ static struct hsrv_handler *new_handler(
 
 static int handle_alias(struct afb_hreq *hreq, void *data)
 {
+       int rc;
        struct hsrv_alias *da = data;
 
        if (hreq->method != afb_method_get) {
+               if (da->relax)
+                       return 0;
                afb_hreq_reply_error(hreq, MHD_HTTP_METHOD_NOT_ALLOWED);
                return 1;
        }
 
        if (!afb_hreq_valid_tail(hreq)) {
+               if (da->relax)
+                       return 0;
                afb_hreq_reply_error(hreq, MHD_HTTP_FORBIDDEN);
                return 1;
        }
 
-       return afb_hreq_reply_file(hreq, da->dirfd, &hreq->tail[1]);
+       rc = afb_hreq_reply_file_if_exist(hreq, da->dirfd, &hreq->tail[1]);
+       if (rc == 0) {
+               if (da->relax)
+                       return 0;
+               afb_hreq_reply_error(hreq, MHD_HTTP_NOT_FOUND);
+       }
+       return 1;
 }
 
 int afb_hsrv_add_handler(
@@ -333,7 +348,7 @@ int afb_hsrv_add_handler(
        return 1;
 }
 
-int afb_hsrv_add_alias(struct afb_hsrv *hsrv, const char *prefix, const char *alias, int priority)
+int afb_hsrv_add_alias(struct afb_hsrv *hsrv, const char *prefix, const char *alias, int priority, int relax)
 {
        struct hsrv_alias *da;
        int dirfd;
@@ -349,6 +364,7 @@ int afb_hsrv_add_alias(struct afb_hsrv *hsrv, const char *prefix, const char *al
                da->directory = alias;
                da->lendir = strlen(da->directory);
                da->dirfd = dirfd;
+               da->relax = relax;
                if (afb_hsrv_add_handler(hsrv, prefix, handle_alias, da, priority))
                        return 1;
                free(da);
@@ -388,14 +404,14 @@ int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection
                MHD_OPTION_END);        /* options-end */
 
        if (httpd == NULL) {
-               fprintf(stderr, "Error: httpStart invalid httpd port: %d", (int)port);
+               ERROR("httpStart invalid httpd port: %d", (int)port);
                return 0;
        }
 
        info = MHD_get_daemon_info(httpd, MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY);
        if (info == NULL) {
                MHD_stop_daemon(httpd);
-               fprintf(stderr, "Error: httpStart no pollfd");
+               ERROR("httpStart no pollfd");
                return 0;
        }
 
@@ -403,7 +419,7 @@ int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection
        if (rc < 0) {
                MHD_stop_daemon(httpd);
                errno = -rc;
-               fprintf(stderr, "Error: connection to events for httpd failed");
+               ERROR("connection to events for httpd failed");
                return 0;
        }