merchant

commit 1b9cb320b1a64e71687fdc760c3e0d888a02e4df
parent b2192b1f0a07cba87e0e79b9ad889d98bb573906
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  1 Jan 2016 20:44:26 +0100

update max_fd to new max, never lower it

Diffstat:
M
src/lib/merchant_api_context.c
 | 
5
++++-

1 file changed, 4 insertions(+), 1 deletion(-)
diff --git 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,