projects
/
psensor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
edda29b
)
added application/json mime type for json http response
author
Jean-Philippe Orsini
<jeanfi@gmail.com>
Thu, 7 Jul 2011 21:54:58 +0000
(21:54 +0000)
committer
Jean-Philippe Orsini
<jeanfi@gmail.com>
Thu, 7 Jul 2011 21:54:58 +0000
(21:54 +0000)
src/server/server.c
patch
|
blob
|
history
diff --git
a/src/server/server.c
b/src/server/server.c
index
e1a2dfc
..
da6b709
100644
(file)
--- a/
src/server/server.c
+++ b/
src/server/server.c
@@
-160,6
+160,8
@@
create_response_api(const char *nurl,
const char *method,
unsigned int *rp_code)
{
const char *method,
unsigned int *rp_code)
{
+ struct MHD_Response *resp;
+ struct psensor *s;
char *page = NULL;
if (!strcmp(nurl, URL_BASE_API_1_0_SENSORS)) {
char *page = NULL;
if (!strcmp(nurl, URL_BASE_API_1_0_SENSORS)) {
@@
-172,8
+174,7
@@
create_response_api(const char *nurl,
const char *sid = nurl + strlen(URL_BASE_API_1_0_SENSORS) + 1;
const char *sid = nurl + strlen(URL_BASE_API_1_0_SENSORS) + 1;
- struct psensor *s
- = psensor_list_get_by_id(server_data.sensors, sid);
+ s = psensor_list_get_by_id(server_data.sensors, sid);
if (s)
page = sensor_to_json_string(s);
if (s)
page = sensor_to_json_string(s);
@@
-188,8
+189,13
@@
create_response_api(const char *nurl,
if (page) {
*rp_code = MHD_HTTP_OK;
if (page) {
*rp_code = MHD_HTTP_OK;
- return MHD_create_response_from_data
- (strlen(page), page, MHD_YES, MHD_NO);
+ resp = MHD_create_response_from_data(strlen(page), page,
+ MHD_YES, MHD_NO);
+
+ MHD_add_response_header(resp, MHD_HTTP_HEADER_CONTENT_TYPE,
+ "application/json");
+
+ return resp;
}
return NULL;
}
return NULL;