diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-01-01 20:44:26 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-01-01 20:44:26 +0100 |
| commit | 1b9cb320b1a64e71687fdc760c3e0d888a02e4df (patch) | |
| tree | 44d1c58d3361b229eda8f950c9745c8c778586c8 /src/lib/merchant_api_context.c | |
| parent | b2192b1f0a07cba87e0e79b9ad889d98bb573906 (diff) | |
| download | merchant-1b9cb320b1a64e71687fdc760c3e0d888a02e4df.tar.gz merchant-1b9cb320b1a64e71687fdc760c3e0d888a02e4df.tar.bz2 merchant-1b9cb320b1a64e71687fdc760c3e0d888a02e4df.zip | |
update max_fd to new max, never lower it
Diffstat (limited to 'src/lib/merchant_api_context.c')
| -rw-r--r-- | src/lib/merchant_api_context.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/merchant_api_context.c b/src/lib/merchant_api_context.c index dd363b05..dc758da3 100644 --- a/src/lib/merchant_api_context.c +++ b/src/lib/merchant_api_context.c @@ -334,13 +334,16 @@ TALER_MERCHANT_get_select_info (struct TALER_MERCHANT_Context *ctx, long *timeout) { long to; + int m; + m = -1; GNUNET_assert (CURLM_OK == curl_multi_fdset (ctx->multi, read_fd_set, write_fd_set, except_fd_set, - max_fd)); + &m)); + *max_fd = GNUNET_MAX (m, *max_fd); to = *timeout; GNUNET_assert (CURLM_OK == curl_multi_timeout (ctx->multi, |