[GNUnet-SVN] r37882 - libmicrohttpd/src/microhttpd

[gnunet]

Author: grothoff
Date: 2016-09-04 18:43:28 +0200 (Sun, 04 Sep 2016)
New Revision: 37882

Modified:
   libmicrohttpd/src/microhttpd/connection.c
   libmicrohttpd/src/microhttpd/test_upgrade_common.c
Log:
-fix where we init daemon

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2016-09-04 16:39:42 UTC (rev 
37881)
+++ libmicrohttpd/src/microhttpd/connection.c   2016-09-04 16:43:28 UTC (rev 
37882)
@@ -3178,6 +3178,7 @@
        ( (MHD_CONNECTION_HEADERS_PROCESSED != connection->state) &&
         (MHD_CONNECTION_FOOTERS_RECEIVED != connection->state) ) )
     return MHD_NO;
+  daemon = connection->daemon;
   if ( (MHD_HTTP_SWITCHING_PROTOCOLS != status_code) &&
        (NULL != response->upgrade_handler) )
     {
@@ -3187,7 +3188,6 @@
 #endif
       return MHD_NO;
     }
-  daemon = connection->daemon;
   if ( (NULL != response->upgrade_handler) &&
        (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
        (0 == (daemon->options & MHD_USE_SUSPEND_RESUME)) )

Modified: libmicrohttpd/src/microhttpd/test_upgrade_common.c
===================================================================
--- libmicrohttpd/src/microhttpd/test_upgrade_common.c  2016-09-04 16:39:42 UTC 
(rev 37881)
+++ libmicrohttpd/src/microhttpd/test_upgrade_common.c  2016-09-04 16:43:28 UTC 
(rev 37882)
@@ -388,15 +388,16 @@
                          &es,
                          &max_fd))
         abort ();
-      MHD_get_timeout (daemon,
-                       &to);
+      (void) MHD_get_timeout (daemon,
+                              &to);
       tv.tv_sec = to / 1000;
       tv.tv_usec = 1000 * (to % 1000);
-      select (max_fd + 1,
-              &rs,
-              &ws,
-              &es,
-              &tv);
+      if (0 > MHD_SYS_select_ (max_fd + 1,
+                               &rs,
+                               &ws,
+                               &es,
+                               &tv))
+        abort ();
       MHD_run_from_select (daemon,
                            &rs,
                            &ws,
@@ -442,8 +443,8 @@
       to = 1000;
 
       FD_SET (ep, &rs);
-      MHD_get_timeout (daemon,
-                       &to);
+      (void) MHD_get_timeout (daemon,
+                              &to);
       tv.tv_sec = to / 1000;
       tv.tv_usec = 1000 * (to % 1000);
       select (ep + 1,