[GNUnet-SVN] r36821 - in libmicrohttpd: . src/microhttpd

[gnunet]

Author: Karlson2k
Date: 2016-01-17 12:32:41 +0100 (Sun, 17 Jan 2016)
New Revision: 36821

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/microhttpd/daemon.c
Log:
Do not give up if sendfile() failed with EINVAL

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2016-01-17 07:45:44 UTC (rev 36820)
+++ libmicrohttpd/ChangeLog     2016-01-17 11:32:41 UTC (rev 36821)
@@ -1,3 +1,7 @@
+Sun Jan 17 11:18:55 CET 2016
+       Do no refuse to send response if sendfile() failed with
+       EINVAL (common error for files located on SMB/CIF). -EG
+
 Sat Jan 16 19:14:39 CET 2016
        Use US-ASCII only (instead of user locale settings) when
        performing caseless string comparison as required by

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2016-01-17 07:45:44 UTC (rev 
36820)
+++ libmicrohttpd/src/microhttpd/daemon.c       2016-01-17 11:32:41 UTC (rev 
36821)
@@ -1158,9 +1158,10 @@
       err = MHD_socket_errno_;
       if ( (EINTR == err) || (EAGAIN == err) || (EWOULDBLOCK == err) )
        return 0;
-      if ( (EINVAL == err) || (EBADF == err) )
+      if (EBADF == err)
        return -1;
-      /* None of the 'usual' sendfile errors occurred, so we should try
+      /* sendfile() failed with EINVAL if mmap()-like operations are not
+        supported for FD or other 'unusual' errors occurred, so we should try
         to fall back to 'SEND'; see also this thread for info on
         odd libc/Linux behavior with sendfile:
         http://lists.gnu.org/archive/html/libmicrohttpd/2011-02/msg00015.html 
*/