[GNUnet-SVN] r37096 - in branches/mhd-0.9.50: . src/testcurl

[gnunet]

Author: Karlson2k
Date: 2016-04-29 23:14:31 +0200 (Fri, 29 Apr 2016)
New Revision: 37096

Modified:
   branches/mhd-0.9.50/ChangeLog
   branches/mhd-0.9.50/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: branches/mhd-0.9.50/ChangeLog
===================================================================
--- branches/mhd-0.9.50/ChangeLog       2016-04-29 21:14:29 UTC (rev 37095)
+++ branches/mhd-0.9.50/ChangeLog       2016-04-29 21:14:31 UTC (rev 37096)
@@ -1,3 +1,9 @@
+Wed Apr 20 18:12:30 CET 2016
+       Fixed macros in sysfdsetsize.c which could prevent compiling with
+       non-default FD_SETSIZE.
+       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 handling of MHD_OPTION_THREAD_POOL_SIZE with
        MHD_USE_SUSPEND_RESUME (regression in 0.9.49).

Modified: branches/mhd-0.9.50/src/testcurl/test_post.c
===================================================================
--- branches/mhd-0.9.50/src/testcurl/test_post.c        2016-04-29 21:14:29 UTC 
(rev 37095)
+++ branches/mhd-0.9.50/src/testcurl/test_post.c        2016-04-29 21:14:31 UTC 
(rev 37096)
@@ -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;
         }