From: Marc Hoersken <info@marc-hoersken.de>
Date: Wed, 16 Dec 2015 14:32:31 +0000 (+0100)
Subject: sockfilt.c: do not wait on unreliable file or pipe handle
X-Git-Tag: curl-7_47_0~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4646b90692cc0ea61616e71c9376890b68f8249;p=thirdparty%2Fcurl.git

sockfilt.c: do not wait on unreliable file or pipe handle

The previous implementation caused issues on modern MSYS2 runtimes.
---

diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index a4496e0fb0..0530dad3f4 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -547,8 +547,8 @@ static DWORD WINAPI select_ws_wait_thread(LPVOID lpParameter)
         * Approach: Loop till either the internal event is signalled
         *           or if the end of the file has already been reached.
         */
-      while(WaitForMultipleObjectsEx(2, handles, FALSE, INFINITE, FALSE)
-            == WAIT_OBJECT_0 + 1) {
+      while(WaitForMultipleObjectsEx(1, handles, FALSE, 0, FALSE)
+            == WAIT_TIMEOUT) {
         /* get total size of file */
         length = 0;
         size.QuadPart = 0;
@@ -611,8 +611,8 @@ static DWORD WINAPI select_ws_wait_thread(LPVOID lpParameter)
         * Approach: Loop till either the internal event is signalled
         *           or there is data in the pipe available for reading.
         */
-      while(WaitForMultipleObjectsEx(2, handles, FALSE, INFINITE, FALSE)
-            == WAIT_OBJECT_0 + 1) {
+      while(WaitForMultipleObjectsEx(1, handles, FALSE, 0, FALSE)
+            == WAIT_TIMEOUT) {
         /* peek into the pipe and retrieve the amount of data available */
         length = 0;
         if(PeekNamedPipe(handle, NULL, 0, NULL, &length, NULL)) {