diff options
Diffstat (limited to 'src/testcurl/test_get.c')
-rw-r--r-- | src/testcurl/test_get.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c index 8fe1c771..09641fc5 100644 --- a/src/testcurl/test_get.c +++ b/src/testcurl/test_get.c | |||
@@ -110,15 +110,15 @@ ahc_echo (void *cls, | |||
110 | void **req_cls) | 110 | void **req_cls) |
111 | { | 111 | { |
112 | static int ptr; | 112 | static int ptr; |
113 | const char *me = cls; | ||
114 | struct MHD_Response *response; | 113 | struct MHD_Response *response; |
115 | enum MHD_Result ret; | 114 | enum MHD_Result ret; |
116 | const char *v; | 115 | const char *v; |
116 | (void) cls; | ||
117 | (void) version; | 117 | (void) version; |
118 | (void) upload_data; | 118 | (void) upload_data; |
119 | (void) upload_data_size; /* Unused. Silence compiler warning. */ | 119 | (void) upload_data_size; /* Unused. Silence compiler warning. */ |
120 | 120 | ||
121 | if (0 != strcmp (me, method)) | 121 | if (0 != strcmp (MHD_HTTP_METHOD_GET, method)) |
122 | return MHD_NO; /* unexpected method */ | 122 | return MHD_NO; /* unexpected method */ |
123 | if (&ptr != *req_cls) | 123 | if (&ptr != *req_cls) |
124 | { | 124 | { |
@@ -156,9 +156,8 @@ ahc_echo (void *cls, | |||
156 | NULL == v ? "NULL" : v); | 156 | NULL == v ? "NULL" : v); |
157 | _exit (19); | 157 | _exit (19); |
158 | } | 158 | } |
159 | response = MHD_create_response_from_buffer (strlen (url), | 159 | response = MHD_create_response_from_buffer_copy (strlen (url), |
160 | (void *) url, | 160 | (const void *) url); |
161 | MHD_RESPMEM_MUST_COPY); | ||
162 | ret = MHD_queue_response (connection, | 161 | ret = MHD_queue_response (connection, |
163 | MHD_HTTP_OK, | 162 | MHD_HTTP_OK, |
164 | response); | 163 | response); |
@@ -195,7 +194,7 @@ testInternalGet (int poll_flag) | |||
195 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 194 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
196 | | poll_flag, | 195 | | poll_flag, |
197 | global_port, NULL, NULL, | 196 | global_port, NULL, NULL, |
198 | &ahc_echo, "GET", | 197 | &ahc_echo, NULL, |
199 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 198 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
200 | MHD_OPTION_END); | 199 | MHD_OPTION_END); |
201 | if (d == NULL) | 200 | if (d == NULL) |
@@ -269,7 +268,7 @@ testMultithreadedGet (int poll_flag) | |||
269 | | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 268 | | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
270 | | poll_flag, | 269 | | poll_flag, |
271 | global_port, NULL, NULL, | 270 | global_port, NULL, NULL, |
272 | &ahc_echo, "GET", | 271 | &ahc_echo, NULL, |
273 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 272 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
274 | MHD_OPTION_END); | 273 | MHD_OPTION_END); |
275 | if (d == NULL) | 274 | if (d == NULL) |
@@ -342,7 +341,7 @@ testMultithreadedPoolGet (int poll_flag) | |||
342 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 341 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
343 | | poll_flag, | 342 | | poll_flag, |
344 | global_port, NULL, NULL, | 343 | global_port, NULL, NULL, |
345 | &ahc_echo, "GET", | 344 | &ahc_echo, NULL, |
346 | MHD_OPTION_THREAD_POOL_SIZE, MHD_CPU_COUNT, | 345 | MHD_OPTION_THREAD_POOL_SIZE, MHD_CPU_COUNT, |
347 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 346 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
348 | MHD_OPTION_END); | 347 | MHD_OPTION_END); |
@@ -426,7 +425,7 @@ testExternalGet () | |||
426 | cbc.pos = 0; | 425 | cbc.pos = 0; |
427 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 426 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
428 | global_port, NULL, NULL, | 427 | global_port, NULL, NULL, |
429 | &ahc_echo, "GET", | 428 | &ahc_echo, NULL, |
430 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 429 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
431 | MHD_OPTION_END); | 430 | MHD_OPTION_END); |
432 | if (d == NULL) | 431 | if (d == NULL) |
@@ -601,7 +600,7 @@ testUnknownPortGet (int poll_flag) | |||
601 | cbc.pos = 0; | 600 | cbc.pos = 0; |
602 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 601 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
603 | | poll_flag, | 602 | | poll_flag, |
604 | 0, NULL, NULL, &ahc_echo, "GET", | 603 | 0, NULL, NULL, &ahc_echo, NULL, |
605 | MHD_OPTION_SOCK_ADDR, &addr, | 604 | MHD_OPTION_SOCK_ADDR, &addr, |
606 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 605 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
607 | MHD_OPTION_END); | 606 | MHD_OPTION_END); |
@@ -688,7 +687,7 @@ testStopRace (int poll_flag) | |||
688 | | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 687 | | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
689 | | poll_flag, | 688 | | poll_flag, |
690 | global_port, NULL, NULL, | 689 | global_port, NULL, NULL, |
691 | &ahc_echo, "GET", | 690 | &ahc_echo, NULL, |
692 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 691 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
693 | MHD_OPTION_END); | 692 | MHD_OPTION_END); |
694 | if (d == NULL) | 693 | if (d == NULL) |