X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hsrv.c;h=886820d6a7e69035b1a2775152c5c0d62f6d36b5;hb=e68a315bcf2bd681466c27026fea73598071bda6;hp=06c90df027f06d955a95d1b5159325154efbf4d6;hpb=8112056eecede587bf884f56629858c8b21bdbec;p=src%2Fapp-framework-binder.git diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c index 06c90df0..886820d6 100644 --- 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 #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); }