aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/curl/curl.c7
-rw-r--r--src/exchange/taler-exchange-httpd_deposit.c12
-rwxr-xr-xsrc/exchange/test_taler_exchange_httpd.sh3
3 files changed, 15 insertions, 7 deletions
diff --git a/src/curl/curl.c b/src/curl/curl.c
index 3e56c7536..b60fb2ce3 100644
--- a/src/curl/curl.c
+++ b/src/curl/curl.c
@@ -1,6 +1,6 @@
/*
This file is part of TALER
- Copyright (C) 2019 GNUnet e.V.
+ Copyright (C) 2019-2020 Taler Systems SA
TALER is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published
@@ -16,10 +16,9 @@
License along with TALER; see the file COPYING. If not, see
<http://www.gnu.org/licenses/>
*/
-
/**
- * @file lib/teah_common.c
- * @brief Helper routines shared by libtalerexchange and libtalerauditor
+ * @file curl/curl.c
+ * @brief Helper routines for interactions with libcurl
* @author Christian Grothoff
*/
#include "platform.h"
diff --git a/src/exchange/taler-exchange-httpd_deposit.c b/src/exchange/taler-exchange-httpd_deposit.c
index 96e30e437..485047784 100644
--- a/src/exchange/taler-exchange-httpd_deposit.c
+++ b/src/exchange/taler-exchange-httpd_deposit.c
@@ -1,6 +1,6 @@
/*
This file is part of TALER
- Copyright (C) 2014-2017 Inria and GNUnet e.V.
+ Copyright (C) 2014-2020 Taler Systems SA
TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU Affero General Public License as published by the Free Software
@@ -432,7 +432,10 @@ TEH_DEPOSIT_handler_deposit (struct TEH_RequestHandler *rh,
upload_data_size,
&json);
if (GNUNET_SYSERR == res)
+ {
+ GNUNET_break (0);
return MHD_NO;
+ }
if ( (GNUNET_NO == res) ||
(NULL == json) )
return MHD_YES;
@@ -444,10 +447,15 @@ TEH_DEPOSIT_handler_deposit (struct TEH_RequestHandler *rh,
spec);
json_decref (json);
if (GNUNET_SYSERR == res)
+ {
+ GNUNET_break (0);
return MHD_NO; /* hard failure */
+ }
if (GNUNET_NO == res)
+ {
+ GNUNET_break_op (0);
return MHD_YES; /* failure */
-
+ }
deposit.receiver_wire_account = wire;
if (deposit.refund_deadline.abs_value_us > deposit.wire_deadline.abs_value_us)
{
diff --git a/src/exchange/test_taler_exchange_httpd.sh b/src/exchange/test_taler_exchange_httpd.sh
index 9c9ef40e1..505723a07 100755
--- a/src/exchange/test_taler_exchange_httpd.sh
+++ b/src/exchange/test_taler_exchange_httpd.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# This file is part of TALER
-# Copyright (C) 2015, 2016 Inria and GNUnet e.V.
+# Copyright (C) 2015-2020 Taler Systems SA
#
# TALER is free software; you can redistribute it and/or modify it under the
# terms of the GNU Affero General Public License as published by the Free Software
@@ -31,6 +31,7 @@ taler-exchange-wire -c test_taler_exchange_httpd.conf || exit 1
# Run Exchange HTTPD (in background)
taler-exchange-httpd -c test_taler_exchange_httpd.conf -i &
# Give HTTP time to start
+# FIXME: replace with while-loop waiting for wget to succeed as in test-auditor.sh!
sleep 5
# Finally run test...
# We read the JSON snippets to POST from test_taler_exchange_httpd.data