commit 3a2adbdaa523ddeed48a4f01788b699ef7916c56
parent 05a51df2d74ca1b56c570bc5629985d21674d184
Author: Bohdan Potuzhnyi <potub1@bfh.ch>
Date: Sun, 6 Oct 2024 15:35:43 +0000
Merge remote-tracking branch 'origin/master' into dev/bohdan-potuzhnyi/donau-integration
Diffstat:
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
@@ -460,6 +460,7 @@ AM_CONDITIONAL([HAVE_POSTGRESQL], [false])
AM_CONDITIONAL([HAVE_TALERUTIL], [false])
AM_CONDITIONAL(HAVE_TALEREXCHANGE, [false])
AM_CONDITIONAL([HAVE_TALERPQ], [false])
+AM_CONDITIONAL([HAVE_DONAU], [false])
AM_CONDITIONAL([HAVE_TALERMHD], [false])
AM_CONDITIONAL([HAVE_TALERJSON], [false])
AM_CONDITIONAL([HAVE_TALERFAKEBANK], [false])
diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c
@@ -75,7 +75,7 @@
* refuses a forced download.
*/
#define MAX_KEYS_WAIT \
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 250)
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 2500)
/**
* Generate the base URL for the given merchant instance.