[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] branch master updated (14a46d9c -> ebe0f498)
|
From: |
gnunet |
|
Subject: |
[libmicrohttpd] branch master updated (14a46d9c -> ebe0f498) |
|
Date: |
Wed, 12 Jan 2022 17:18:25 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a change to branch master
in repository libmicrohttpd.
from 14a46d9c test_quiesce: added more checking and error reporting
new 856d7168 testcurl tests: updated to use test helpers in local headers
new ebe0f498 tests: simplified libcurl HTTP settings
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/testcurl/Makefile.am | 80 ++++++++++++++++----------------
src/testcurl/test_add_conn.c | 12 ++---
src/testcurl/test_get.c | 3 +-
src/testcurl/test_get_close_keep_alive.c | 12 ++---
src/testcurl/test_get_empty.c | 3 +-
src/testcurl/test_large_put.c | 40 ++++++++--------
src/testcurl/test_toolarge.c | 12 ++---
src/testcurl/test_tricky.c | 12 ++---
8 files changed, 86 insertions(+), 88 deletions(-)
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index 3d9f6000..da209679 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -183,7 +183,7 @@ test_concurrent_stop_LDADD = \
$(PTHREAD_LIBS) $(LDADD)
test_get_SOURCES = \
- test_get.c
+ test_get.c mhd_has_in_name.h mhd_has_param.h
test_quiesce_SOURCES = \
test_quiesce.c mhd_has_param.h mhd_has_in_name.h
@@ -264,56 +264,54 @@ test_urlparse_SOURCES = \
test_get_response_cleanup_SOURCES = \
test_get_response_cleanup.c mhd_has_in_name.h
-test_get_response_cleanup_LDADD = \
- $(top_builddir)/src/microhttpd/libmicrohttpd.la
test_get_chunked_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_close_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_string_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_close_string_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_empty_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_close_empty_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_string_empty_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_close_string_empty_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_sized_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_close_sized_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_empty_sized_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_close_empty_sized_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_forced_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_close_forced_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_empty_forced_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_get_chunked_close_empty_forced_SOURCES = \
- test_get_chunked.c
+ test_get_chunked.c mhd_has_in_name.h
test_post_SOURCES = \
test_post.c mhd_has_in_name.h
@@ -351,35 +349,35 @@ test_put_chunked_SOURCES = \
test_put_chunked.c
test_add_conn_SOURCES = \
- test_add_conn.c $(top_srcdir)/src/microhttpd/test_helpers.h
+ test_add_conn.c mhd_has_in_name.h mhd_has_param.h
test_add_conn_CFLAGS = \
$(PTHREAD_CFLAGS) $(AM_CFLAGS)
test_add_conn_LDADD = \
$(PTHREAD_LIBS) $(LDADD)
test_add_conn_nolisten_SOURCES = \
- test_add_conn.c $(top_srcdir)/src/microhttpd/test_helpers.h
+ test_add_conn.c mhd_has_in_name.h mhd_has_param.h
test_add_conn_nolisten_CFLAGS = \
$(PTHREAD_CFLAGS) $(AM_CFLAGS)
test_add_conn_nolisten_LDADD = \
$(PTHREAD_LIBS) $(LDADD)
test_add_conn_cleanup_SOURCES = \
- test_add_conn.c $(top_srcdir)/src/microhttpd/test_helpers.h
+ test_add_conn.c mhd_has_in_name.h mhd_has_param.h
test_add_conn_cleanup_CFLAGS = \
$(PTHREAD_CFLAGS) $(AM_CFLAGS)
test_add_conn_cleanup_LDADD = \
$(PTHREAD_LIBS) $(LDADD)
test_add_conn_cleanup_nolisten_SOURCES = \
- test_add_conn.c $(top_srcdir)/src/microhttpd/test_helpers.h
+ test_add_conn.c mhd_has_in_name.h mhd_has_param.h
test_add_conn_cleanup_nolisten_CFLAGS = \
$(PTHREAD_CFLAGS) $(AM_CFLAGS)
test_add_conn_cleanup_nolisten_LDADD = \
$(PTHREAD_LIBS) $(LDADD)
test_get11_SOURCES = \
- test_get.c
+ test_get.c mhd_has_in_name.h mhd_has_param.h
test_get_iovec11_SOURCES = \
test_get_iovec.c mhd_has_in_name.h
@@ -388,16 +386,16 @@ test_get_sendfile11_SOURCES = \
test_get_sendfile.c mhd_has_in_name.h
test_get_close_SOURCES = \
- test_get_close_keep_alive.c $(top_srcdir)/src/microhttpd/test_helpers.h
+ test_get_close_keep_alive.c mhd_has_in_name.h mhd_has_param.h
test_get_close10_SOURCES = \
- test_get_close_keep_alive.c $(top_srcdir)/src/microhttpd/test_helpers.h
+ test_get_close_keep_alive.c mhd_has_in_name.h mhd_has_param.h
test_get_keep_alive_SOURCES = \
- test_get_close_keep_alive.c $(top_srcdir)/src/microhttpd/test_helpers.h
+ test_get_close_keep_alive.c mhd_has_in_name.h mhd_has_param.h
test_get_keep_alive10_SOURCES = \
- test_get_close_keep_alive.c $(top_srcdir)/src/microhttpd/test_helpers.h
+ test_get_close_keep_alive.c mhd_has_in_name.h mhd_has_param.h
test_post11_SOURCES = \
test_post.c mhd_has_in_name.h
@@ -414,13 +412,13 @@ test_put11_SOURCES = \
test_put.c mhd_has_in_name.h
test_large_put_SOURCES = \
- test_large_put.c
+ test_large_put.c mhd_has_in_name.h mhd_has_param.h
test_large_put11_SOURCES = \
- test_large_put.c
+ test_large_put.c mhd_has_in_name.h mhd_has_param.h
test_large_put_inc11_SOURCES = \
- test_large_put.c
+ test_large_put.c mhd_has_in_name.h mhd_has_param.h
test_long_header_SOURCES = \
test_long_header.c mhd_has_in_name.h
@@ -438,32 +436,32 @@ test_timeout_SOURCES = \
test_timeout.c mhd_has_in_name.h
test_toolarge_method_SOURCES = \
- test_toolarge.c ../microhttpd/test_helpers.h
+ test_toolarge.c mhd_has_in_name.h mhd_has_param.h
test_toolarge_url_SOURCES = \
- test_toolarge.c ../microhttpd/test_helpers.h
+ test_toolarge.c mhd_has_in_name.h mhd_has_param.h
test_toolarge_request_header_name_SOURCES = \
- test_toolarge.c ../microhttpd/test_helpers.h
+ test_toolarge.c mhd_has_in_name.h mhd_has_param.h
test_toolarge_request_header_value_SOURCES = \
- test_toolarge.c ../microhttpd/test_helpers.h
+ test_toolarge.c mhd_has_in_name.h mhd_has_param.h
test_toolarge_request_headers_SOURCES = \
- test_toolarge.c ../microhttpd/test_helpers.h
+ test_toolarge.c mhd_has_in_name.h mhd_has_param.h
test_toolarge_reply_header_name_SOURCES = \
- test_toolarge.c ../microhttpd/test_helpers.h
+ test_toolarge.c mhd_has_in_name.h mhd_has_param.h
test_toolarge_reply_header_value_SOURCES = \
- test_toolarge.c ../microhttpd/test_helpers.h
+ test_toolarge.c mhd_has_in_name.h mhd_has_param.h
test_toolarge_reply_headers_SOURCES = \
- test_toolarge.c ../microhttpd/test_helpers.h
+ test_toolarge.c mhd_has_in_name.h mhd_has_param.h
test_tricky_url_SOURCES = \
- test_tricky.c ../microhttpd/test_helpers.h
+ test_tricky.c mhd_has_in_name.h mhd_has_param.h
test_tricky_header2_SOURCES = \
- test_tricky.c ../microhttpd/test_helpers.h
+ test_tricky.c mhd_has_in_name.h mhd_has_param.h
\ No newline at end of file
diff --git a/src/testcurl/test_add_conn.c b/src/testcurl/test_add_conn.c
index 8f3916ab..746ecbaf 100644
--- a/src/testcurl/test_add_conn.c
+++ b/src/testcurl/test_add_conn.c
@@ -32,7 +32,8 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include "test_helpers.h"
+#include "mhd_has_in_name.h"
+#include "mhd_has_param.h"
#include "mhd_sockets.h" /* only macros used */
@@ -445,11 +446,10 @@ curlEasyInitForTest (const char *queryPath, int port,
struct CBC *pcbc)
(CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT,
(long) response_timeout_val)) ||
(CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) ||
- ((oneone) ?
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_1)) :
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_0))))
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ (oneone) ?
+ CURL_HTTP_VERSION_1_1 :
+ CURL_HTTP_VERSION_1_0)))
{
fprintf (stderr, "curl_easy_setopt() failed.\n");
_exit (99);
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c
index 26b32b11..58febf7a 100644
--- a/src/testcurl/test_get.c
+++ b/src/testcurl/test_get.c
@@ -31,7 +31,8 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include "test_helpers.h"
+#include "mhd_has_in_name.h"
+#include "mhd_has_param.h"
#include "mhd_sockets.h" /* only macros used */
diff --git a/src/testcurl/test_get_close_keep_alive.c
b/src/testcurl/test_get_close_keep_alive.c
index db8a0284..2fca0ce3 100644
--- a/src/testcurl/test_get_close_keep_alive.c
+++ b/src/testcurl/test_get_close_keep_alive.c
@@ -34,7 +34,8 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include "test_helpers.h"
+#include "mhd_has_in_name.h"
+#include "mhd_has_param.h"
#include "mhd_sockets.h" /* only macros used */
#ifdef HAVE_STRINGS_H
@@ -421,11 +422,10 @@ curlEasyInitForTest (const char *queryPath, int port,
struct CBC *pcbc,
(CURLE_OK != curl_easy_setopt (c, CURLOPT_HEADERDATA,
hdr_chk_result)) ||
(CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) ||
- ((oneone) ?
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_1)) :
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_0))))
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ (oneone) ?
+ CURL_HTTP_VERSION_1_1 :
+ CURL_HTTP_VERSION_1_0)))
{
fprintf (stderr, "curl_easy_setopt() failed.\n");
externalErrorExit ();
diff --git a/src/testcurl/test_get_empty.c b/src/testcurl/test_get_empty.c
index e75e907c..5ed71ab9 100644
--- a/src/testcurl/test_get_empty.c
+++ b/src/testcurl/test_get_empty.c
@@ -31,7 +31,8 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include "test_helpers.h"
+#include "mhd_has_in_name.h"
+#include "mhd_has_param.h"
#include "mhd_sockets.h" /* only macros used */
diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c
index ff9b4eb3..b00d0e1a 100644
--- a/src/testcurl/test_large_put.c
+++ b/src/testcurl/test_large_put.c
@@ -38,7 +38,8 @@
#include <unistd.h>
#endif
-#include "test_helpers.h"
+#include "mhd_has_in_name.h"
+#include "mhd_has_param.h"
#if defined(MHD_CPU_COUNT) && (MHD_CPU_COUNT + 0) < 2
#undef MHD_CPU_COUNT
@@ -364,11 +365,11 @@ testPutInternalThread (unsigned int add_flag)
(long) 150)) ||
(CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT,
(long) 150)) ||
- ((oneone) ?
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_1)) :
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_0))))
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ (oneone) ?
+ CURL_HTTP_VERSION_1_1 :
+ CURL_HTTP_VERSION_1_0)))
+
{
fprintf (stderr, "curl_easy_setopt() failed.\n");
externalErrorExit ();
@@ -470,11 +471,10 @@ testPutThreadPerConn (unsigned int add_flag)
(long) 150)) ||
(CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT,
(long) 150)) ||
- ((oneone) ?
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_1)) :
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_0))))
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ (oneone) ?
+ CURL_HTTP_VERSION_1_1 :
+ CURL_HTTP_VERSION_1_0)))
{
fprintf (stderr, "curl_easy_setopt() failed.\n");
externalErrorExit ();
@@ -576,11 +576,10 @@ testPutThreadPool (unsigned int add_flag)
(long) 150)) ||
(CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT,
(long) 150)) ||
- ((oneone) ?
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_1)) :
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_0))))
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ (oneone) ?
+ CURL_HTTP_VERSION_1_1 :
+ CURL_HTTP_VERSION_1_0)))
{
fprintf (stderr, "curl_easy_setopt() failed.\n");
externalErrorExit ();
@@ -688,11 +687,10 @@ testPutExternal (void)
(long) 150)) ||
(CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT,
(long) 150)) ||
- ((oneone) ?
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_1)) :
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_0))))
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ (oneone) ?
+ CURL_HTTP_VERSION_1_1 :
+ CURL_HTTP_VERSION_1_0)))
{
fprintf (stderr, "curl_easy_setopt() failed.\n");
externalErrorExit ();
diff --git a/src/testcurl/test_toolarge.c b/src/testcurl/test_toolarge.c
index 4f33da2a..6f78d7ba 100644
--- a/src/testcurl/test_toolarge.c
+++ b/src/testcurl/test_toolarge.c
@@ -39,7 +39,8 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include "test_helpers.h"
+#include "mhd_has_in_name.h"
+#include "mhd_has_param.h"
#include "mhd_sockets.h" /* only macros used */
#ifdef HAVE_STRINGS_H
@@ -576,11 +577,10 @@ curlEasyInitForTest (const char *queryPath, const char
*method,
(CURLE_OK != curl_easy_setopt (c, CURLOPT_HEADERDATA,
hdr_chk_result)) ||
(CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) ||
- ((oneone) ?
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_1)) :
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_0))))
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ (oneone) ?
+ CURL_HTTP_VERSION_1_1 :
+ CURL_HTTP_VERSION_1_0)))
libcurlErrorExitDesc ("curl_easy_setopt() failed");
if (CURLE_OK != curl_easy_setopt (c, CURLOPT_CUSTOMREQUEST, method))
diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c
index fb881fd6..50af68a1 100644
--- a/src/testcurl/test_tricky.c
+++ b/src/testcurl/test_tricky.c
@@ -31,7 +31,8 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include "test_helpers.h"
+#include "mhd_has_in_name.h"
+#include "mhd_has_param.h"
#include "mhd_sockets.h" /* only macros used */
#ifdef HAVE_STRINGS_H
@@ -499,11 +500,10 @@ curlEasyInitForTest (struct curlQueryParams *p,
(long) 1)) ||
#endif /* CURL_AT_LEAST_VERSION(7, 42, 0) */
(CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) ||
- ((oneone) ?
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_1)) :
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_0))))
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ (oneone) ?
+ CURL_HTTP_VERSION_1_1 :
+ CURL_HTTP_VERSION_1_0)))
libcurlErrorExitDesc ("curl_easy_setopt() failed");
if (CURLE_OK != curl_easy_setopt (c, CURLOPT_CUSTOMREQUEST, p->method))
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [libmicrohttpd] branch master updated (14a46d9c -> ebe0f498),
gnunet <=