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

[gnunet]

Author: grothoff
Date: 2016-05-12 08:59:56 +0200 (Thu, 12 May 2016)
New Revision: 37159

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
Log:
-fix fix

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2016-05-12 06:45:18 UTC (rev 
37158)
+++ libmicrohttpd/src/microhttpd/daemon.c       2016-05-12 06:59:56 UTC (rev 
37159)
@@ -1229,6 +1229,7 @@
       offsetu64 = connection->response_write_position + 
connection->response->fd_off;
       left = connection->response->total_size - 
connection->response_write_position;
       ret = 0;
+      MHD_set_socket_errno_(ENOMEM);
 #ifndef HAVE_SENDFILE64
       offset = (off_t) offsetu64;
       if ( (offsetu64 <= (uint64_t) OFF_T_MAX) &&
@@ -1263,7 +1264,7 @@
 #endif
   ret = (ssize_t) send (connection->socket_fd, other, 
(_MHD_socket_funcs_size)i, MSG_NOSIGNAL);
 #if EPOLL_SUPPORT
-  if ( (0 > ret) || (EAGAIN == MHD_socket_errno_) )
+  if ( (0 > ret) && (EAGAIN == MHD_socket_errno_) )
     {
       /* EAGAIN --- no longer write-ready */
       connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY;