[libmicrohttpd] branch master updated (1e7346ce -> 76caa290)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 1e7346ce test_digestauth: removed unneeded escaping in test URL
     new a9010033 test_digestauth*: fixed possible use of uninitialised data
     new 76caa290 test: fixed processing '--quiet' parameter

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/microhttpd/test_client_put_stop.c         | 6 ++++--
 src/microhttpd/test_upgrade.c                 | 8 ++++----
 src/microhttpd/test_upgrade_large.c           | 8 ++++----
 src/testcurl/test_add_conn.c                  | 5 ++++-
 src/testcurl/test_digestauth.c                | 4 ++--
 src/testcurl/test_digestauth_sha256.c         | 4 ++--
 src/testcurl/test_digestauth_with_arguments.c | 2 +-
 src/testcurl/test_get_close_keep_alive.c      | 5 ++++-
 src/testcurl/test_quiesce.c                   | 5 ++++-
 src/testcurl/test_toolarge.c                  | 5 ++++-
 src/testcurl/test_tricky.c                    | 5 ++++-
 11 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/src/microhttpd/test_client_put_stop.c 
b/src/microhttpd/test_client_put_stop.c
index 6c641e6f..09845ff9 100644
--- a/src/microhttpd/test_client_put_stop.c
+++ b/src/microhttpd/test_client_put_stop.c
@@ -1985,8 +1985,10 @@ main (int argc, char *const *argv)
 #endif /* ! SO_LINGER */
   if (1 != use_shutdown + use_close)
     return 99;
-  verbose =
-    ! (has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet"));
+  verbose = ! (has_param (argc, argv, "-q") ||
+               has_param (argc, argv, "--quiet") ||
+               has_param (argc, argv, "-s") ||
+               has_param (argc, argv, "--silent"));
 
   test_global_init ();
 
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index 0bbb08e9..acaecf9f 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -1384,10 +1384,10 @@ main (int argc,
   use_tls_tool = TLS_CLI_NO_TOOL;
   test_tls = has_in_name (argv[0], "_tls");
 
-  verbose = 1;
-  if (has_param (argc, argv, "-q") ||
-      has_param (argc, argv, "--quiet"))
-    verbose = 0;
+  verbose = ! (has_param (argc, argv, "-q") ||
+               has_param (argc, argv, "--quiet") ||
+               has_param (argc, argv, "-s") ||
+               has_param (argc, argv, "--silent"));
 
   if (test_tls)
   {
diff --git a/src/microhttpd/test_upgrade_large.c 
b/src/microhttpd/test_upgrade_large.c
index 1928080d..e04e7ebf 100644
--- a/src/microhttpd/test_upgrade_large.c
+++ b/src/microhttpd/test_upgrade_large.c
@@ -1585,10 +1585,10 @@ main (int argc,
   use_tls_tool = TLS_CLI_NO_TOOL;
   test_tls = has_in_name (argv[0], "_tls");
 
-  verbose = 1;
-  if (has_param (argc, argv, "-q") ||
-      has_param (argc, argv, "--quiet"))
-    verbose = 0;
+  verbose = ! (has_param (argc, argv, "-q") ||
+               has_param (argc, argv, "--quiet") ||
+               has_param (argc, argv, "-s") ||
+               has_param (argc, argv, "--silent"));
   if (test_tls)
   {
 #ifdef HTTPS_SUPPORT
diff --git a/src/testcurl/test_add_conn.c b/src/testcurl/test_add_conn.c
index 811bfba4..62386657 100644
--- a/src/testcurl/test_add_conn.c
+++ b/src/testcurl/test_add_conn.c
@@ -1131,7 +1131,10 @@ main (int argc, char *const *argv)
   if (cleanup_test)
     return 77; /* Cannot run without threads */
 #endif /* HAVE_PTHREAD_H */
-  verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, 
"--quiet");
+  verbose = ! (has_param (argc, argv, "-q") ||
+               has_param (argc, argv, "--quiet") ||
+               has_param (argc, argv, "-s") ||
+               has_param (argc, argv, "--silent"));
   if (cleanup_test)
   {
 #ifndef _WIN32
diff --git a/src/testcurl/test_digestauth.c b/src/testcurl/test_digestauth.c
index 47d4f5d0..a2b38b2e 100644
--- a/src/testcurl/test_digestauth.c
+++ b/src/testcurl/test_digestauth.c
@@ -423,8 +423,8 @@ testDigestAuth ()
   while (off < 8)
   {
     len = read (fd,
-                rnd,
-                8);
+                rnd + off,
+                8 - off);
     if (len == (size_t) -1)
       externalErrorExitDesc ("Failed to read '/dev/urandom'");
     off += len;
diff --git a/src/testcurl/test_digestauth_sha256.c 
b/src/testcurl/test_digestauth_sha256.c
index f6df664e..bb0e786c 100644
--- a/src/testcurl/test_digestauth_sha256.c
+++ b/src/testcurl/test_digestauth_sha256.c
@@ -198,8 +198,8 @@ testDigestAuth ()
   while (off < 8)
   {
     len = read (fd,
-                rnd,
-                8);
+                rnd + off,
+                8 - off);
     if (len == (size_t) -1)
     {
       fprintf (stderr,
diff --git a/src/testcurl/test_digestauth_with_arguments.c 
b/src/testcurl/test_digestauth_with_arguments.c
index ac1aed56..602c1180 100644
--- a/src/testcurl/test_digestauth_with_arguments.c
+++ b/src/testcurl/test_digestauth_with_arguments.c
@@ -181,7 +181,7 @@ testDigestAuth ()
   }
   while (off < 8)
   {
-    len = read (fd, rnd, 8);
+    len = read (fd, rnd + off, 8 - off);
     if (len == (size_t) -1)
     {
       fprintf (stderr,
diff --git a/src/testcurl/test_get_close_keep_alive.c 
b/src/testcurl/test_get_close_keep_alive.c
index 1cb46e68..8f83fa1d 100644
--- a/src/testcurl/test_get_close_keep_alive.c
+++ b/src/testcurl/test_get_close_keep_alive.c
@@ -1062,7 +1062,10 @@ main (int argc, char *const *argv)
   conn_close = has_in_name (argv[0], "_close");
   if (! conn_close && ! has_in_name (argv[0], "_keep_alive"))
     return 99;
-  verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, 
"--quiet");
+  verbose = ! (has_param (argc, argv, "-q") ||
+               has_param (argc, argv, "--quiet") ||
+               has_param (argc, argv, "-s") ||
+               has_param (argc, argv, "--silent"));
 
   test_global_init ();
 
diff --git a/src/testcurl/test_quiesce.c b/src/testcurl/test_quiesce.c
index 1ea194b9..f7703db7 100644
--- a/src/testcurl/test_quiesce.c
+++ b/src/testcurl/test_quiesce.c
@@ -721,7 +721,10 @@ main (int argc, char *const *argv)
 {
   unsigned int errorCount = 0;
   oneone = ! has_in_name (argv[0], "10");
-  verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, 
"--quiet");
+  verbose = ! (has_param (argc, argv, "-q") ||
+               has_param (argc, argv, "--quiet") ||
+               has_param (argc, argv, "-s") ||
+               has_param (argc, argv, "--silent"));
 
   if (0 != curl_global_init (CURL_GLOBAL_WIN32))
     return 2;
diff --git a/src/testcurl/test_toolarge.c b/src/testcurl/test_toolarge.c
index 134fd8af..d8bfaef6 100644
--- a/src/testcurl/test_toolarge.c
+++ b/src/testcurl/test_toolarge.c
@@ -1537,7 +1537,10 @@ main (int argc, char *const *argv)
       + large_req_header_value + large_req_headers + large_rsp_header_name
       + large_rsp_header_value + large_rsp_headers != 1)
     return 99;
-  verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, 
"--quiet");
+  verbose = ! (has_param (argc, argv, "-q") ||
+               has_param (argc, argv, "--quiet") ||
+               has_param (argc, argv, "-s") ||
+               has_param (argc, argv, "--silent"));
 
   test_global_init ();
 
diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c
index afb29bbd..1aca7dce 100644
--- a/src/testcurl/test_tricky.c
+++ b/src/testcurl/test_tricky.c
@@ -1079,7 +1079,10 @@ main (int argc, char *const *argv)
   tricky_header2 = has_in_name (argv[0], "_header2") ? 1 : 0;
   if (1 != tricky_url + tricky_header2)
     return 99;
-  verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, 
"--quiet");
+  verbose = ! (has_param (argc, argv, "-q") ||
+               has_param (argc, argv, "--quiet") ||
+               has_param (argc, argv, "-s") ||
+               has_param (argc, argv, "--silent"));
 
 #if ! CURL_AT_LEAST_VERSION (7, 62, 0)
   if (tricky_url)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.