[GNUnet-SVN] r37068 - in libmicrohttpd: . src/testcurl

[gnunet]

Author: Karlson2k
Date: 2016-04-23 18:16:03 +0200 (Sat, 23 Apr 2016)
New Revision: 37068

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/testcurl/test_quiesce.c
Log:
test_quiesce: do not violate our API

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2016-04-23 16:16:01 UTC (rev 37067)
+++ libmicrohttpd/ChangeLog     2016-04-23 16:16:03 UTC (rev 37068)
@@ -1,3 +1,6 @@
+Sat Apr 23 16:06:30 CET 2016
+       Improved test_quiesce test. -EG
+
 Sat Apr 23 15:39:38 CET 2016
        Notify other threads in MHD_quiesce_daemon() so listen socket FD
        is removed from awaiting select() and poll(). -EG

Modified: libmicrohttpd/src/testcurl/test_quiesce.c
===================================================================
--- libmicrohttpd/src/testcurl/test_quiesce.c   2016-04-23 16:16:01 UTC (rev 
37067)
+++ libmicrohttpd/src/testcurl/test_quiesce.c   2016-04-23 16:16:03 UTC (rev 
37068)
@@ -150,8 +150,13 @@
       MHD_SYS_select_ (max + 1, &rs, &ws, &es, &tv);
       MHD_run (d);
     }
+  fd = MHD_quiesce_daemon (d);
+  if (MHD_INVALID_SOCKET == fd)
+    {
+      MHD_stop_daemon (d);
+      return "MHD_quiesce_daemon() failed in ServeOneRequest()";
+    }
   MHD_stop_daemon (d);
-  MHD_socket_close_(fd);
   return done ? NULL : "Requests was not served by ServeOneRequest()";
 }
 
@@ -429,7 +434,6 @@
             MHD_stop_daemon (d);
             return 2;
           }
-       MHD_socket_close_ (fd);
         c = setupCURL (&cbc);
         multi = curl_multi_init ();
         mret = curl_multi_add_handle (multi, c);
@@ -450,6 +454,7 @@
       curl_multi_cleanup (multi);
     }
   MHD_stop_daemon (d);
+  MHD_socket_close_ (fd);
   if (cbc.pos != strlen ("/hello_world"))
     return 8192;
   if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world")))