← Back to branch summary

~ubuntu-branches/ubuntu/saucy/curl/saucy-security

« back to all changes in this revision

Viewing changes to tests/libtest/lib504.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2011-11-25 17:30:45 UTC
  • mfrom: (3.4.23 sid)
  • Revision ID: package-import@ubuntu.com-20111125173045-2l3ni88jv16kath0
Tags: 7.22.0-3ubuntu1
* Merge from Debian unstable, remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Add new libcurl3-udeb package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/libtest/lib504.c
21
21
 ***************************************************************************/
22
22
#include "test.h"
23
23
 
24
 
#include <sys/types.h>
25
 
 
26
24
#include "testutil.h"
27
25
#include "warnless.h"
28
26
#include "memdebug.h"
106
104
 
107
105
    fprintf(stderr, "curl_multi_perform()\n");
108
106
 
109
 
    ret = CURLM_CALL_MULTI_PERFORM;
110
 
 
111
 
    while (ret == CURLM_CALL_MULTI_PERFORM) {
112
 
      ret = curl_multi_perform(m, &running);
113
 
      if (tutil_tvdiff(tutil_tvnow(), mp_start) >
114
 
          MULTI_PERFORM_HANG_TIMEOUT) {
115
 
        mp_timedout = TRUE;
116
 
        break;
117
 
      }
 
107
    ret = curl_multi_perform(m, &running);
 
108
    if (tutil_tvdiff(tutil_tvnow(), mp_start) >
 
109
        MULTI_PERFORM_HANG_TIMEOUT) {
 
110
      mp_timedout = TRUE;
 
111
      break;
118
112
    }
119
113
    if (mp_timedout)
120
114
      break;