test2032: spurious failure caused by premature termination

Bug: http://curl.haxx.se/mail/lib-2012-11/0095.html

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e62a689..5c779fd 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -44,6 +44,7 @@ This release includes the following bugfixes:
  o TFTP: handle resends
  o autoconf: don't force-disable compiler debug option
  o winbuild: Fix PDB file output [17]
+ o test2032: spurious failure caused by premature termination [18]
 
 This release includes the following known bugs:
 
@@ -81,3 +82,4 @@ References to bug reports and discussions on issues:
  [15] = https://github.com/bagder/curl/pull/50
  [16] = http://curl.haxx.se/mail/lib-2012-11/0125.html
  [17] = http://curl.haxx.se/bug/view.cgi?id=3586741
+ [18] = http://curl.haxx.se/mail/lib-2012-11/0095.html

diff --git a/tests/libtest/libntlmconnect.c b/tests/libtest/libntlmconnect.c
index b31a928..cef3306 100644 (file)
--- a/tests/libtest/libntlmconnect.c
+++ b/tests/libtest/libntlmconnect.c
@@ -207,7 +207,7 @@ int test(char *url)
     }
 
     if (state == NeedSocketForNewHandle) {
-      if (found_new_socket) {
+      if(!found_new_socket) {
         fprintf(stderr, "Warning: socket did not open immediately for new "
                 "handle (trying again)\n");
         continue;
@@ -234,7 +234,7 @@ int test(char *url)
       /* 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
          sense */
-      if(num_handles == MAX_EASY_HANDLES) {
+      if(!running && num_handles == MAX_EASY_HANDLES) {
         break;
       }
     }