From: Phil <phil.buschmann@tum.de>
Date: Mon, 22 Jan 2018 16:38:45 +0000 (+0100)
Subject: Merge branch 'master' into identity_oidc
X-Git-Tag: v0.11.0pre66~201^2~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8c785ca6cea5c84d84fb900a8f519a4d87a3fe8c;p=oweals%2Fgnunet.git

Merge branch 'master' into identity_oidc
---

8c785ca6cea5c84d84fb900a8f519a4d87a3fe8c
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,