[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated (221698d -> 13e7110)
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated (221698d -> 13e7110) |
Date: |
Sat, 22 Aug 2020 18:51:02 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository merchant.
from 221698d include h_contract in refund URL, as it is needed for
authentication
new 740e5d8 needs = in URI
new 13e7110 log where parsing failed
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c | 2 +-
src/lib/merchant_api_common.c | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c
b/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c
index a0fa457..b5ef07b 100644
--- a/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c
+++ b/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c
@@ -90,7 +90,7 @@ make_taler_refund_uri (struct MHD_Connection *connection,
GNUNET_buffer_write_path (&buf,
""); // Trailing slash
GNUNET_buffer_write_str (&buf,
- "?h_contract");
+ "?h_contract=");
GNUNET_buffer_write_data_encoded (&buf,
&h_contract,
sizeof (*h_contract));
diff --git a/src/lib/merchant_api_common.c b/src/lib/merchant_api_common.c
index f375efd..55d4209 100644
--- a/src/lib/merchant_api_common.c
+++ b/src/lib/merchant_api_common.c
@@ -361,7 +361,7 @@ TALER_MERCHANT_parse_pay_uri_free (
*
* @param refund_uri the URI to parse.
* @param[out] parse_data data extracted from the URI. Must be free'd.
- * @return GNUNET_SYSERR if @e refund_uri is malformed, GNUNET_OK otherwise.
+ * @return #GNUNET_SYSERR if @e refund_uri is malformed, #GNUNET_OK otherwise.
*/
int
TALER_MERCHANT_parse_refund_uri (
@@ -379,6 +379,7 @@ TALER_MERCHANT_parse_refund_uri (
(0 != strcmp ("refund",
action)))
{
+ GNUNET_break_op (0);
GNUNET_free (action);
GNUNET_free (path);
return GNUNET_SYSERR;
@@ -395,6 +396,7 @@ TALER_MERCHANT_parse_refund_uri (
if (NULL == last_seg)
{
+ GNUNET_break_op (0);
GNUNET_free (path);
return GNUNET_SYSERR;
}
@@ -405,6 +407,7 @@ TALER_MERCHANT_parse_refund_uri (
'/');
if (NULL == order_id)
{
+ GNUNET_break_op (0);
GNUNET_free (path);
return GNUNET_SYSERR;
}
@@ -421,6 +424,7 @@ TALER_MERCHANT_parse_refund_uri (
if (0 != strlen (last_seg))
{
+ GNUNET_break_op (0);
GNUNET_free (path);
return GNUNET_SYSERR;
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] branch master updated (221698d -> 13e7110),
gnunet <=