[libmicrohttpd] branch master updated (16ac89f3 -> 3db35a4c)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 16ac89f3 Fixed: avoid duplication of "close" token in replies
     new 02af598a test_get_close_keep_alive: minor reporting improvment
     new 83c0cc07 Updated .gitignore
     new 3db35a4c test_get_close_keep_alive: removed double assignment of curl 
header

The 3 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:
 .gitignore                               |  1 +
 src/testcurl/test_get_close_keep_alive.c | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index be7d81f0..f6c2a684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ uncrustify.cfg
 **.dvi
 **.t2d
 src/microhttpd_ws/test_websocket
+.texlipse
diff --git a/src/testcurl/test_get_close_keep_alive.c 
b/src/testcurl/test_get_close_keep_alive.c
index 21461e0d..1dbf7cc4 100644
--- a/src/testcurl/test_get_close_keep_alive.c
+++ b/src/testcurl/test_get_close_keep_alive.c
@@ -381,8 +381,6 @@ curlEasyInitForTest (const char *queryPath, int port, 
struct CBC *pcbc,
                                      lcurl_hdr_callback)) ||
       (CURLE_OK != curl_easy_setopt (c, CURLOPT_HEADERDATA,
                                      hdr_chk_result)) ||
-      (add_hdr_k_alive && (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTPHEADER,
-                                                         curl_k_alive_hdr))) ||
       (CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) ||
       (oneone) ?
       (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
@@ -669,8 +667,8 @@ doCurlQueryInThread (struct MHD_Daemon *d,
       if (0 != getMhdActiveConnections (d))
       {
         print_test_params (add_hdr_close, add_hdr_k_alive);
-        fprintf (stderr,
-                 "MHD still has active connection after response has been 
sent.\n");
+        fprintf (stderr, "MHD still has active connection "
+                 "after response has been sent.\n");
         p->queryError |= 2;
       }
     }
@@ -694,13 +692,22 @@ doCurlQueryInThread (struct MHD_Daemon *d,
     if (use_external_poll)
     { /* The number of MHD connection can be used only with external poll.
        * otherwise it creates a race condition. */
-      if (1 != getMhdActiveConnections (d))
+      unsigned int num_conn = getMhdActiveConnections (d);
+      if (0 == num_conn)
       {
         print_test_params (add_hdr_close, add_hdr_k_alive);
-        fprintf (stderr,
-                 "MHD has no active connection after response has been 
sent.\n");
+        fprintf (stderr, "MHD has no active connection "
+                 "after response has been sent.\n");
         p->queryError |= 2;
       }
+      else if (1 != num_conn)
+      {
+        print_test_params (add_hdr_close, add_hdr_k_alive);
+        fprintf (stderr, "MHD has wrong number of active connection (%u) "
+                 "after response has been sent. Line: %d\n", num_conn,
+                 __LINE__);
+        _exit (23);
+      }
     }
   }
   curl_easy_cleanup (c);

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