projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c785ca
)
-fix unsafed file
author
Phil
<phil.buschmann@tum.de>
Mon, 22 Jan 2018 16:42:12 +0000
(17:42 +0100)
committer
Phil
<phil.buschmann@tum.de>
Mon, 22 Jan 2018 16:42:12 +0000
(17:42 +0100)
src/rest/gnunet-rest-server.c
patch
|
blob
|
history
diff --git
a/src/rest/gnunet-rest-server.c
b/src/rest/gnunet-rest-server.c
index a67b3203a8e29142991e068ab80240c3a5f57ad1..ea8108f3afc58504f33de8c1ce1ab605f0bbeee7 100644
(file)
--- a/
src/rest/gnunet-rest-server.c
+++ b/
src/rest/gnunet-rest-server.c
@@
-398,12
+398,10
@@
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,
@@
-416,7
+414,6
@@
create_response (void *cls,
{
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,