Merge branch 'master' into identity_oidc

diff --cc src/rest/gnunet-rest-server.c
index c14b09819c20959eef5c24fc5c032d8a815177be,072f24cb2b47136e49fae8a7cd591d8fd41eb400..a67b3203a8e29142991e068ab80240c3a5f57ad1
--- 1/src/rest/gnunet-rest-server.c
--- 2/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,