diff options
| author | Christian Grothoff <christian@grothoff.org> | 2019-04-06 15:01:40 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2019-04-06 15:01:40 +0200 |
| commit | 651298eb21664969908fc6bb8b9b126e953498e4 (patch) | |
| tree | e8bcb644e2b2c7e07ca2edddf38b53c7212d4d38 /src/backend/taler-merchant-httpd.c | |
| parent | 3a38124fa780be01a06bb7d3a3c7d51824f256cf (diff) | |
| download | merchant-651298eb21664969908fc6bb8b9b126e953498e4.tar.gz merchant-651298eb21664969908fc6bb8b9b126e953498e4.tar.bz2 merchant-651298eb21664969908fc6bb8b9b126e953498e4.zip | |
add missing abort() to error handling in /pay transaction, start to use GNUNET_memcmp()
Diffstat (limited to 'src/backend/taler-merchant-httpd.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 1eb39261..31a1c9d2 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -43,6 +43,7 @@ #include "taler-merchant-httpd_tip-authorize.h" #include "taler-merchant-httpd_tip-pickup.h" #include "taler-merchant-httpd_tip-query.h" +#include "taler-merchant-httpd_tip-reserve-helper.h" #include "taler-merchant-httpd_history.h" #include "taler-merchant-httpd_refund.h" #include "taler-merchant-httpd_check-payment.h" @@ -356,12 +357,13 @@ hashmap_free (void *cls, static void do_shutdown (void *cls) { + MH_force_pc_resume (); + MH_force_trh_resume (); if (NULL != mhd_task) { GNUNET_SCHEDULER_cancel (mhd_task); mhd_task = NULL; } - MH_force_pc_resume (); if (NULL != mhd) { MHD_stop_daemon (mhd); |