fix one-page-application redirect

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

diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c
index 06c90df..886820d 100644 (file)
--- a/src/afb-hsrv.c
+++ b/src/afb-hsrv.c
@@ -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"
@@ -156,7 +156,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;
                        }
@@ -300,6 +302,19 @@ static struct hsrv_handler *new_handler(
        return head;
 }
 
+static int handle_alias_relax(struct afb_hreq *hreq, void *data)
+{
+       struct hsrv_alias *da = data;
+
+       if (hreq->method != afb_method_get)
+               return 0;
+
+       if (!afb_hreq_valid_tail(hreq))
+               return 0;
+
+       return afb_hreq_reply_file_if_exist(hreq, da->dirfd, &hreq->tail[1]);
+}
+
 static int handle_alias(struct afb_hreq *hreq, void *data)
 {
        struct hsrv_alias *da = data;
@@ -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,7 +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;
-               if (afb_hsrv_add_handler(hsrv, prefix, handle_alias, da, priority))
+               if (afb_hsrv_add_handler(hsrv, prefix, relax ? handle_alias_relax : handle_alias, da, priority))
                        return 1;
                free(da);
        }