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

[gnunet]

Author: grothoff
Date: 2011-03-18 13:34:34 +0100 (Fri, 18 Mar 2011)
New Revision: 14672

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/daemon.c
Log:
removing MSG_DONTWAIT as per discussion on ML

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2011-03-17 16:53:06 UTC (rev 14671)
+++ libmicrohttpd/ChangeLog     2011-03-18 12:34:34 UTC (rev 14672)
@@ -1,3 +1,7 @@
+Fri Mar 18 13:23:47 CET 2011
+       Removing MSG_DONTWAIT which should not be needed and was presumably
+       causing problems with EAGAIN under certain circumstances. -ES
+
 Fri Mar 11 22:25:29 CET 2011
        Fixing bug in MHD_create_response_from_fd_at_offset with non-zero 
offsets. -ES
 

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2011-03-17 16:53:06 UTC (rev 14671)
+++ libmicrohttpd/src/daemon/daemon.c   2011-03-18 12:34:34 UTC (rev 14672)
@@ -75,10 +75,7 @@
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
 #endif
-#ifndef MSG_DONTWAIT
-#define MSG_DONTWAIT 0
 #endif
-#endif
 
 /**
  * Default implementation of the panic function
@@ -712,7 +709,7 @@
     return -1;
   if (0 != (connection->daemon->options & MHD_USE_SSL))
     return RECV (connection->socket_fd, other, i, MSG_NOSIGNAL);
-  return RECV (connection->socket_fd, other, i, MSG_NOSIGNAL | MSG_DONTWAIT);
+  return RECV (connection->socket_fd, other, i, MSG_NOSIGNAL);
 }
 
 /**
@@ -767,7 +764,7 @@
         http://lists.gnu.org/archive/html/libmicrohttpd/2011-02/msg00015.html 
*/
     }
 #endif
-  return SEND (connection->socket_fd, other, i, MSG_NOSIGNAL | MSG_DONTWAIT);
+  return SEND (connection->socket_fd, other, i, MSG_NOSIGNAL);
 }