From 50550d7ed65b9f86b7c231abc993dd858db01c09 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Wed, 1 Jun 2016 12:01:36 +0200 Subject: [PATCH] fixed build issue when MHD_create_response_from_data is deprecated --- NEWS | 2 ++ src/server/server.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index e205f59..dc253b2 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,8 @@ v1.1.4 * psensor-server: avoid to retrieve files which are not under the webserver directory. +* Fixed compilation failure due to MHD_create_response_from_buffer + which has been deprecated v1.1.3 ------ diff --git a/src/server/server.c b/src/server/server.c index 95998c8..ffbd814 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -193,8 +193,9 @@ create_response_api(const char *nurl, const char *method, unsigned int *rp_code) if (page) { *rp_code = MHD_HTTP_OK; - resp = MHD_create_response_from_data(strlen(page), page, - MHD_YES, MHD_NO); + resp = MHD_create_response_from_buffer(strlen(page), + page, + MHD_RESPMEM_MUST_FREE); MHD_add_response_header(resp, MHD_HTTP_HEADER_CONTENT_TYPE, "application/json"); @@ -224,8 +225,8 @@ static struct MHD_Response *create_response_file(const char *nurl, if (!st.st_size) { fclose(file); - return MHD_create_response_from_data - (0, NULL, MHD_NO, MHD_NO); + return MHD_create_response_from_buffer + (0, NULL, 0); } return MHD_create_response_from_callback @@ -275,10 +276,9 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code) page = strdup(PAGE_NOT_FOUND); *rp_code = MHD_HTTP_NOT_FOUND; - return MHD_create_response_from_data(strlen(page), - page, - MHD_YES, - MHD_NO); + return MHD_create_response_from_buffer(strlen(page), + page, + MHD_RESPMEM_MUST_FREE); } static int cbk_http_request(void *cls, -- 2.7.4