diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2016-05-05 09:13:47 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2016-05-05 09:13:47 +0000 |
commit | e2e045f3fef2231c435ae7dacbb5e947a0193a20 (patch) | |
tree | b7e82a64747f01328ec7bbc621ac0bef9af1a839 /src/rest | |
parent | ebcc6d29c91f2091950e53820f98c2a95bca3a7a (diff) | |
download | gnunet-e2e045f3fef2231c435ae7dacbb5e947a0193a20.tar.gz gnunet-e2e045f3fef2231c435ae7dacbb5e947a0193a20.zip |
- remove HAVE_REST, remove json reference from rest
Diffstat (limited to 'src/rest')
-rw-r--r-- | src/rest/Makefile.am | 2 | ||||
-rw-r--r-- | src/rest/rest.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/rest/Makefile.am b/src/rest/Makefile.am index 9ab7c03e0..c0feb9122 100644 --- a/src/rest/Makefile.am +++ b/src/rest/Makefile.am | |||
@@ -38,7 +38,7 @@ libgnunetrest_la_SOURCES = \ | |||
38 | rest.c | 38 | rest.c |
39 | libgnunetrest_la_LIBADD = \ | 39 | libgnunetrest_la_LIBADD = \ |
40 | $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \ | 40 | $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \ |
41 | $(GN_LIBINTL) -lmicrohttpd -ljansson | 41 | $(GN_LIBINTL) -lmicrohttpd |
42 | libgnunetrest_la_LDFLAGS = \ | 42 | libgnunetrest_la_LDFLAGS = \ |
43 | $(GN_LIB_LDFLAGS) \ | 43 | $(GN_LIB_LDFLAGS) \ |
44 | -version-info 0:0:0 | 44 | -version-info 0:0:0 |
diff --git a/src/rest/rest.c b/src/rest/rest.c index bf32c9849..b0d7e5ace 100644 --- a/src/rest/rest.c +++ b/src/rest/rest.c | |||
@@ -48,13 +48,13 @@ GNUNET_REST_namespace_match (const char *url, const char *namespace) | |||
48 | } | 48 | } |
49 | 49 | ||
50 | /** | 50 | /** |
51 | * Create JSON API MHD response | 51 | * Create MHD response |
52 | * | 52 | * |
53 | * @param data JSON result | 53 | * @param data result |
54 | * @retun MHD response | 54 | * @retun MHD response |
55 | */ | 55 | */ |
56 | struct MHD_Response* | 56 | struct MHD_Response* |
57 | GNUNET_REST_create_json_response (const char *data) | 57 | GNUNET_REST_create_response (const char *data) |
58 | { | 58 | { |
59 | struct MHD_Response *resp; | 59 | struct MHD_Response *resp; |
60 | size_t len; | 60 | size_t len; |
@@ -69,7 +69,6 @@ GNUNET_REST_create_json_response (const char *data) | |||
69 | resp = MHD_create_response_from_buffer (len, | 69 | resp = MHD_create_response_from_buffer (len, |
70 | (void*)data, | 70 | (void*)data, |
71 | MHD_RESPMEM_MUST_COPY); | 71 | MHD_RESPMEM_MUST_COPY); |
72 | MHD_add_response_header (resp,MHD_HTTP_HEADER_CONTENT_TYPE,"application/json"); | ||
73 | return resp; | 72 | return resp; |
74 | 73 | ||
75 | } | 74 | } |