diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/rest/gnunet-rest-server.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c index a67b3203a..ea8108f3a 100644 --- a/src/rest/gnunet-rest-server.c +++ b/src/rest/gnunet-rest-server.c | |||
@@ -398,12 +398,10 @@ create_response (void *cls, | |||
398 | MHD_GET_ARGUMENT_KIND, | 398 | MHD_GET_ARGUMENT_KIND, |
399 | &url_iterator, | 399 | &url_iterator, |
400 | rest_conndata_handle); | 400 | rest_conndata_handle); |
401 | <<<<<<< HEAD | ||
402 | MHD_get_connection_values (con, | 401 | MHD_get_connection_values (con, |
403 | MHD_HEADER_KIND, | 402 | MHD_HEADER_KIND, |
404 | &header_iterator, | 403 | &header_iterator, |
405 | rest_conndata_handle); | 404 | rest_conndata_handle); |
406 | ======= | ||
407 | con_handle->pp = MHD_create_post_processor(con, | 405 | con_handle->pp = MHD_create_post_processor(con, |
408 | 4000, | 406 | 4000, |
409 | post_data_iter, | 407 | post_data_iter, |
@@ -416,7 +414,6 @@ create_response (void *cls, | |||
416 | { | 414 | { |
417 | MHD_destroy_post_processor(con_handle->pp); | 415 | MHD_destroy_post_processor(con_handle->pp); |
418 | } | 416 | } |
419 | >>>>>>> master | ||
420 | con_handle->state = GN_REST_STATE_PROCESSING; | 417 | con_handle->state = GN_REST_STATE_PROCESSING; |
421 | con_handle->plugin->process_request (rest_conndata_handle, | 418 | con_handle->plugin->process_request (rest_conndata_handle, |
422 | &plugin_callback, | 419 | &plugin_callback, |