[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: fix minor merchant issues
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: fix minor merchant issues |
Date: |
Tue, 08 Dec 2020 18:53:24 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new cdb3274d fix minor merchant issues
cdb3274d is described below
commit cdb3274dad03f6362e1e20a510bac950eef1628d
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Dec 8 18:53:17 2020 +0100
fix minor merchant issues
---
src/backend/taler-merchant-httpd_post-orders-ID-pay.c | 2 +-
src/lib/merchant_api_tip_pickup2.c | 6 ++++++
src/merchant-tools/taler-merchant-setup-reserve.c | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
index 93835a24..1767eb2a 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
@@ -828,7 +828,7 @@ process_pay_with_exchange (void *cls,
pc,
MHD_HTTP_FAILED_DEPENDENCY,
TALER_MHD_make_json_pack (
- "{s:s, s:I, s:o, s:o}",
+ "{s:s, s:I, s:o, s:o?}",
"hint",
TALER_ErrorCode_get_hint (
TALER_EC_MERCHANT_POST_ORDERS_ID_PAY_DENOMINATION_KEY_NOT_FOUND),
diff --git a/src/lib/merchant_api_tip_pickup2.c
b/src/lib/merchant_api_tip_pickup2.c
index f32a6feb..946d961e 100644
--- a/src/lib/merchant_api_tip_pickup2.c
+++ b/src/lib/merchant_api_tip_pickup2.c
@@ -316,6 +316,7 @@ TALER_MERCHANT_tip_pickup2 (struct GNUNET_CURL_Context *ctx,
{
GNUNET_break (0);
json_decref (tp_obj);
+ GNUNET_free (tpo->url);
GNUNET_free (tpo);
return NULL;
}
@@ -333,6 +334,11 @@ TALER_MERCHANT_tip_pickup2 (struct GNUNET_CURL_Context
*ctx,
tpo->post_ctx.headers,
&handle_tip_pickup_finished,
tpo);
+ if (NULL == tpo->job)
+ {
+ TALER_MERCHANT_tip_pickup2_cancel (tpo);
+ return NULL;
+ }
return tpo;
}
diff --git a/src/merchant-tools/taler-merchant-setup-reserve.c
b/src/merchant-tools/taler-merchant-setup-reserve.c
index 7e89eb44..c5617233 100644
--- a/src/merchant-tools/taler-merchant-setup-reserve.c
+++ b/src/merchant-tools/taler-merchant-setup-reserve.c
@@ -208,7 +208,7 @@ run (void *cls,
auth_header))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed so sett %s header, trying without\n",
+ "Failed so set %s header, trying without\n",
MHD_HTTP_HEADER_AUTHORIZATION);
}
GNUNET_free (auth_header);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: fix minor merchant issues,
gnunet <=