diff options
| author | Özgür Kesim <oec@codeblau.de> | 2021-07-23 21:23:55 +0200 |
|---|---|---|
| committer | Özgür Kesim <oec@codeblau.de> | 2021-07-23 21:23:55 +0200 |
| commit | 99d66b85ba0b6f9d91039e6b2cf92a3b65e1b995 (patch) | |
| tree | ed4eb22557a8f48e8afca4bb9e3f1b38918fcdab | |
| parent | dfae188d618fb7c9e12ec61528b36f3d43f5a301 (diff) | |
| parent | d34de0edb1cb017975e8fd57d3aa17161bd88d6b (diff) | |
| download | merchant-99d66b85ba0b6f9d91039e6b2cf92a3b65e1b995.tar.gz merchant-99d66b85ba0b6f9d91039e6b2cf92a3b65e1b995.tar.bz2 merchant-99d66b85ba0b6f9d91039e6b2cf92a3b65e1b995.zip | |
Merge branch 'master' of ssh://git.taler.net/merchant
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index ac223a5b..104d7435 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -890,7 +890,8 @@ prepare_daemon (void) &max)); haveto = MHD_get_timeout (mhd, &timeout); if (haveto == MHD_YES) - tv.rel_value_us = (uint64_t) timeout * 1000LL; + tv = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, + timeout); else tv = GNUNET_TIME_UNIT_FOREVER_REL; GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1); |