[GNUnet-SVN] r16440 - in libmicrohttpd: . src/daemon

[gnunet]

Author: grothoff
Date: 2011-08-11 11:40:48 +0200 (Thu, 11 Aug 2011)
New Revision: 16440

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/daemon.c
Log:
use non-blocking sockets

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2011-08-11 08:38:41 UTC (rev 16439)
+++ libmicrohttpd/ChangeLog     2011-08-11 09:40:48 UTC (rev 16440)
@@ -1,3 +1,7 @@
+Thu Aug 11 11:40:03 CEST 2011
+       Changing sockets to be non-blocking as suggested by Eivind Sarto
+       on the mailinglist. -CG
+
 Mon Jul 25 16:13:15 CEST 2011
        Added a logo. -CG
 

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2011-08-11 08:38:41 UTC (rev 16439)
+++ libmicrohttpd/src/daemon/daemon.c   2011-08-11 09:40:48 UTC (rev 16440)
@@ -765,7 +765,6 @@
 }
 
 
-#if HTTPS_SUPPORT
 /**
  * Set if a socket should use non-blocking IO.
  * @param fd socket
@@ -798,7 +797,6 @@
     }
 #endif
 }
-#endif
 
 
 /**
@@ -978,6 +976,7 @@
   MHD_set_http_callbacks_ (connection);
   connection->recv_cls = &recv_param_adapter;
   connection->send_cls = &send_param_adapter;
+  socket_set_nonblocking (connection->socket_fd);
 #if HTTPS_SUPPORT
   if (0 != (daemon->options & MHD_USE_SSL))
     {
@@ -988,11 +987,6 @@
       gnutls_init (&connection->tls_session, GNUTLS_SERVER);
       gnutls_priority_set (connection->tls_session,
                           daemon->priority_cache);
-      if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
-       {
-         /* use non-blocking IO for gnutls */
-         socket_set_nonblocking (connection->socket_fd);
-       }
       switch (daemon->cred_type)
         {
           /* set needed credentials for certificate authentication. */