summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2016-04-20 18:29:38 +0000
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2016-04-20 18:29:38 +0000
commit11dc6d06afa0fe8f7d2eb8a64d9a7698a3192434 (patch)
treeabe875df045db481d1bc4e1851d88c84dc99e06f
parentca51b3506847042eaf62fa1e21219ca3df44e475 (diff)
Updated test_post.c to not ignore specific error on W32 if libcurl
is built with workaround for WinSock bug.
-rw-r--r--ChangeLog7
-rw-r--r--src/testcurl/test_post.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e0c3e3de..87765140 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/src/testcurl/test_post.c b/src/testcurl/test_post.c
index 992f8b8b..7872e652 100644
--- a/src/testcurl/test_post.c
+++ b/src/testcurl/test_post.c
@@ -598,8 +598,10 @@ testMultithreadedPostCancelPart(int flags)
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;
}