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

[gnunet]

Author: Karlson2k
Date: 2016-10-11 17:20:47 +0200 (Tue, 11 Oct 2016)
New Revision: 38106

Modified:
   libmicrohttpd/src/microhttpd/response.c
Log:
Use MHD_socket_pair_nblk_ for HTTP Upgrade

Modified: libmicrohttpd/src/microhttpd/response.c
===================================================================
--- libmicrohttpd/src/microhttpd/response.c     2016-10-11 15:20:44 UTC (rev 
38105)
+++ libmicrohttpd/src/microhttpd/response.c     2016-10-11 15:20:47 UTC (rev 
38106)
@@ -719,6 +719,13 @@
     char *buf;
     MHD_socket sv[2];
 
+#ifdef MHD_socket_pair_nblk_
+    if (! MHD_socket_pair_nblk_ (sv))
+    {
+      free (urh);
+      return MHD_NO;
+    }
+#else  /* !MHD_socket_pair_nblk_ */
     if (! MHD_socket_pair_ (sv))
     {
       free (urh);
@@ -733,6 +740,7 @@
                  MHD_socket_last_strerr_ ());
 #endif
       }
+#endif /* !MHD_socket_pair_nblk_ */
     if ( (! MHD_SCKT_FD_FITS_FDSET_(sv[1], NULL)) &&
          (0 == (daemon->options & (MHD_USE_POLL | MHD_USE_EPOLL))) )
       {