1 files changed, 9 insertions, 2 deletions

diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 7b3ff20c..67fe978a 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -522,7 +522,10 @@ recv_param_adapter (struct MHD_Connection *connection, void *other, size_t i)
 {
   if (connection->socket_fd == -1)
     return -1;
-  return RECV (connection->socket_fd, other, i, MSG_NOSIGNAL);
+  if (0 != (connection->daemon->options & MHD_USE_SSL))
+    return RECV (connection->socket_fd, other, i, MSG_NOSIGNAL);
+  else
+    return RECV (connection->socket_fd, other, i, MSG_NOSIGNAL | MSG_DONTWAIT);
 }
 
 /**
@@ -539,7 +542,10 @@ send_param_adapter (struct MHD_Connection *connection,
 {
   if (connection->socket_fd == -1)
     return -1;
-  return SEND (connection->socket_fd, other, i, MSG_NOSIGNAL);
+  if (0 != (connection->daemon->options & MHD_USE_SSL))
+    return SEND (connection->socket_fd, other, i, MSG_NOSIGNAL);
+  else
+    return SEND (connection->socket_fd, other, i, MSG_NOSIGNAL | MSG_DONTWAIT);
 }
 
 /**
@@ -991,6 +997,7 @@ MHD_start_daemon (unsigned int options,
   return ret;
 }
 
+
 /**
  * Start a webserver on the given port.
  *