[GNUnet-SVN] [gnunet] 37/45: Merge branch 'master' into identity_oidc

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 8c785ca6cea5c84d84fb900a8f519a4d87a3fe8c
Merge: 963b0f5a7 4fce9ab87
Author: Phil <address@hidden>
AuthorDate: Mon Jan 22 17:38:45 2018 +0100

    Merge branch 'master' into identity_oidc

 src/include/gnunet_json_lib.h | 10 +++++++++
 src/json/json_helper.c        | 48 +++++++++++++++++++++++++++++++++++++++
 src/json/test_json.c          | 40 +++++++++++++++++++++++++++++++++
 src/rest/gnunet-rest-server.c | 52 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 150 insertions(+)

diff --cc src/rest/gnunet-rest-server.c
index c14b09819,072f24cb2..a67b3203a
--- a/src/rest/gnunet-rest-server.c
+++ b/src/rest/gnunet-rest-server.c
@@@ -361,10 -363,18 +398,25 @@@ create_response (void *cls
                                 MHD_GET_ARGUMENT_KIND,
                                 &url_iterator,
                                 rest_conndata_handle);
++<<<<<<< HEAD
 +    MHD_get_connection_values (con,
 +                               MHD_HEADER_KIND,
 +                               &header_iterator,
 +                               rest_conndata_handle);
++=======
+     con_handle->pp = MHD_create_post_processor(con,
+                                                4000,
+                                                post_data_iter,
+                                                rest_conndata_handle);
+     if (*upload_data_size)
+     {
+       MHD_post_process(con_handle->pp, upload_data, *upload_data_size);
+     }
+     else
+     {
+       MHD_destroy_post_processor(con_handle->pp);
+     }
++>>>>>>> master
      con_handle->state = GN_REST_STATE_PROCESSING;
      con_handle->plugin->process_request (rest_conndata_handle,
                                           &plugin_callback,

-- 
To stop receiving notification emails like this one, please contact
address@hidden