[GNUnet-SVN] r37059 - in libmicrohttpd: . src/testcurl

[gnunet]

Author: Karlson2k
Date: 2016-04-20 20:29:38 +0200 (Wed, 20 Apr 2016)
New Revision: 37059

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/testcurl/test_post.c
Log:
Updated test_post.c to not ignore specific error on W32 if libcurl
is built with workaround for WinSock bug.

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2016-04-19 19:57:54 UTC (rev 37058)
+++ libmicrohttpd/ChangeLog     2016-04-20 18:29:38 UTC (rev 37059)
@@ -1,3 +1,10 @@
+Wed Apr 20 18:12:30 CET 2016
+       Fixed macros in sysfdsetsize.c which could prevent compiling with
+       non-default FD_SETSIZE.
+       Fixed comments in mhd_str.c.
+       Updated test_post.c to not ignore specific error on W32 if libcurl
+       is built with workaround for WinSock bug. -EG
+
 Mon Apr 18 19:35:14 CET 2016
        Fixed data races leading to inability in rare situations to
        resume suspended connection. -EG

Modified: libmicrohttpd/src/testcurl/test_post.c
===================================================================
--- libmicrohttpd/src/testcurl/test_post.c      2016-04-19 19:57:54 UTC (rev 
37058)
+++ libmicrohttpd/src/testcurl/test_post.c      2016-04-20 18:29:38 UTC (rev 
37059)
@@ -598,8 +598,10 @@
   if (CURLE_HTTP_RETURNED_ERROR != (errornum = curl_easy_perform (c)))
     {
 #ifdef _WIN32
-      if (0 != (flags & FLAG_SLOW_READ) && CURLE_RECV_ERROR == errornum)
-        {
+      curl_version_info_data *curlverd = curl_version_info(CURLVERSION_NOW);
+      if (0 != (flags & FLAG_SLOW_READ) && CURLE_RECV_ERROR == errornum &&
+          (curlverd == NULL || curlverd->ares_num < 0x073100) )
+        { /* libcurl up to version 7.49.0 didn't have workaround for WinSock 
bug */
           fprintf (stderr, "Ignored curl_easy_perform expected failure on W32 
with \"slow read\".\n");
           result = 0;
         }