From 38608820bc40d39f91112e76c61a9329a51bde5b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 11 Aug 2011 09:40:48 +0000 Subject: use non-blocking sockets --- src/daemon/daemon.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/daemon/daemon.c') diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c index 4b9049d1..ced8a64c 100644 --- a/src/daemon/daemon.c +++ b/src/daemon/daemon.c @@ -765,7 +765,6 @@ send_param_adapter (struct MHD_Connection *connection, } -#if HTTPS_SUPPORT /** * Set if a socket should use non-blocking IO. * @param fd socket @@ -798,7 +797,6 @@ socket_set_nonblocking (int fd) } #endif } -#endif /** @@ -978,6 +976,7 @@ MHD_add_connection (struct MHD_Daemon *daemon, 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 @@ MHD_add_connection (struct MHD_Daemon *daemon, 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. */ -- cgit v1.2.3