diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-07-04 14:47:10 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-07-11 23:41:24 +0200 |
| commit | acefdd0cd17443dae59921ae9f1245385e5ad4d0 (patch) | |
| tree | e7b4dc4ac72d10027e26ced1ee6429d16e891394 /tests | |
| parent | 151d3c56dcadc6b04508bdcb85acf2f0f96e4aff (diff) | |
| download | curl-acefdd0cd17443dae59921ae9f1245385e5ad4d0.tar.gz | |
multi: always do the COMPLETED procedure/state
It was previously erroneously skipped in some situations.
libtest/libntlmconnect.c wrongly depended on wrong behavior (that it
would get a zero timeout) when no handles are "running" in a multi
handle. That behavior is no longer present with this fix. Now libcurl
will always return a -1 timeout when all handles are completed.
Closes #2733
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libtest/libntlmconnect.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/libtest/libntlmconnect.c b/tests/libtest/libntlmconnect.c index 59f94b68a..519c5296e 100644 --- a/tests/libtest/libntlmconnect.c +++ b/tests/libtest/libntlmconnect.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2012 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -158,6 +158,9 @@ int test(char *url) multi_perform(multi, &running); + fprintf(stderr, "%s:%d running %ld state %d\n", + __FILE__, __LINE__, running, state); + abort_on_test_timeout(); if(!running && state == NoMoreHandles) @@ -179,14 +182,16 @@ int test(char *url) } state = num_handles < MAX_EASY_HANDLES ? ReadyForNewHandle : NoMoreHandles; + fprintf(stderr, "%s:%d new state %d\n", + __FILE__, __LINE__, state); } multi_timeout(multi, &timeout); /* At this point, timeout is guaranteed to be greater or equal than -1. */ - fprintf(stderr, "%s:%d num_handles %d timeout %ld\n", - __FILE__, __LINE__, num_handles, timeout); + fprintf(stderr, "%s:%d num_handles %d timeout %ld running %d\n", + __FILE__, __LINE__, num_handles, timeout, running); if(timeout != -1L) { int itimeout = (timeout > (long)INT_MAX) ? INT_MAX : (int)timeout; @@ -194,8 +199,8 @@ int test(char *url) interval.tv_usec = (itimeout%1000)*1000; } else { - interval.tv_sec = TEST_HANG_TIMEOUT/1000 + 1; - interval.tv_usec = 0; + interval.tv_sec = 0; + interval.tv_usec = 5000; /* if there's no timeout and we get here on the last handle, we may already have read the last part of the stream so waiting makes no |