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

[gnunet]

Author: grothoff
Date: 2013-08-10 17:33:50 +0200 (Sat, 10 Aug 2013)
New Revision: 28484

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/daemon.c
Log:
-disable use of shutdown on W32

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2013-08-10 06:22:33 UTC (rev 28483)
+++ libmicrohttpd/ChangeLog     2013-08-10 15:33:50 UTC (rev 28484)
@@ -1,3 +1,8 @@
+Sat Aug 10 17:31:31 CEST 2013
+       Disable use of 'shutdown' on W32 always as winsock
+       doesn't properly behave with half-closed connections
+       (see http://www.chilkatsoft.com/p/p_299.asp). -CG/LRN
+
 Thu Aug  8 07:55:07 CEST 2013
        Fixing issue with pipelining not working as desired. -CG
 

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2013-08-10 06:22:33 UTC (rev 
28483)
+++ libmicrohttpd/src/include/microhttpd.h      2013-08-10 15:33:50 UTC (rev 
28484)
@@ -439,8 +439,11 @@
   MHD_USE_DUAL_STACK = MHD_USE_IPv6 | 2048,
 
   /**
-   * Enable EPOLL turbo.  Only useful with MHD_USE_EPOLL_LINUX_ONLY.
-   * Highly experimental, do not use in production yet.
+   * Enable EPOLL turbo.  Disables certain calls to 'shutdown'
+   * and enables aggressive non-blocking optimisitc reads.
+   * Most effects only happen with MHD_USE_EPOLL_LINUX_ONLY.
+   * Enalbed always on W32 as winsock doesn't properly behave
+   * with shutdown and this then fixes potential problems.
    */
   MHD_USE_EPOLL_TURBO = 4096
 

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2013-08-10 06:22:33 UTC (rev 
28483)
+++ libmicrohttpd/src/microhttpd/daemon.c       2013-08-10 15:33:50 UTC (rev 
28484)
@@ -2841,6 +2841,11 @@
 #endif
   daemon->socket_fd = -1;
   daemon->options = (enum MHD_OPTION) flags;
+#if WINDOWS
+  /* Winsock is broken with respect to 'shutdown';
+     this disables us calling 'shutdown' on W32. */
+  daemon->options |= MHD_USE_EPOLL_TURBO;
+#endif
   daemon->port = port;
   daemon->apc = apc;
   daemon->apc_cls = apc_cls;