[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated: Fix last change.
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated: Fix last change. |
Date: |
Wed, 13 Jun 2018 18:36:32 +0200 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 426733e Fix last change.
426733e is described below
commit 426733e21b22283a4c9aef58be2654c49a3a539b
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Jun 13 18:35:16 2018 +0200
Fix last change.
NOTE: the Authorization header is to be added
only _once_, as it stays around until the very
end when it gets freed by libgnunetcurl.
---
src/lib/merchant_api_pay.c | 4 ----
src/lib/merchant_api_proposal.c | 5 -----
src/lib/merchant_api_track_transaction.c | 4 ----
src/lib/merchant_api_track_transfer.c | 5 -----
src/merchant-tools/taler-merchant-generate-payments.c | 5 +++++
5 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/lib/merchant_api_pay.c b/src/lib/merchant_api_pay.c
index 44518d7..93b6478 100644
--- a/src/lib/merchant_api_pay.c
+++ b/src/lib/merchant_api_pay.c
@@ -592,10 +592,6 @@ request_pay_generic (struct GNUNET_CURL_Context *ctx,
curl_easy_setopt (eh,
CURLOPT_POSTFIELDSIZE,
strlen (ph->json_enc)));
- GNUNET_assert
- (GNUNET_OK == GNUNET_CURL_append_header
- (ctx, APIKEY_SANDBOX));
-
ph->job = GNUNET_CURL_job_add (ctx,
eh,
GNUNET_YES,
diff --git a/src/lib/merchant_api_proposal.c b/src/lib/merchant_api_proposal.c
index 47446ee..72b44fa 100644
--- a/src/lib/merchant_api_proposal.c
+++ b/src/lib/merchant_api_proposal.c
@@ -245,11 +245,6 @@ TALER_MERCHANT_order_put (struct GNUNET_CURL_Context *ctx,
curl_easy_setopt (eh,
CURLOPT_POSTFIELDSIZE,
strlen (po->json_enc)));
-
- GNUNET_assert
- (GNUNET_OK == GNUNET_CURL_append_header
- (ctx, APIKEY_SANDBOX));
-
po->job = GNUNET_CURL_job_add (ctx,
eh,
GNUNET_YES,
diff --git a/src/lib/merchant_api_track_transaction.c
b/src/lib/merchant_api_track_transaction.c
index 4336c5a..ae5d903 100644
--- a/src/lib/merchant_api_track_transaction.c
+++ b/src/lib/merchant_api_track_transaction.c
@@ -170,10 +170,6 @@ TALER_MERCHANT_track_transaction (struct
GNUNET_CURL_Context *ctx,
curl_easy_setopt (eh,
CURLOPT_URL,
tdo->url));
- GNUNET_assert
- (GNUNET_OK == GNUNET_CURL_append_header
- (ctx, APIKEY_SANDBOX));
-
tdo->job = GNUNET_CURL_job_add (ctx,
eh,
GNUNET_YES,
diff --git a/src/lib/merchant_api_track_transfer.c
b/src/lib/merchant_api_track_transfer.c
index 467ffa9..7c78532 100644
--- a/src/lib/merchant_api_track_transfer.c
+++ b/src/lib/merchant_api_track_transfer.c
@@ -254,11 +254,6 @@ TALER_MERCHANT_track_transfer (struct GNUNET_CURL_Context
*ctx,
curl_easy_setopt (eh,
CURLOPT_URL,
tdo->url));
-
- GNUNET_assert
- (GNUNET_OK == GNUNET_CURL_append_header
- (ctx, APIKEY_SANDBOX));
-
tdo->job = GNUNET_CURL_job_add (ctx,
eh,
GNUNET_YES,
diff --git a/src/merchant-tools/taler-merchant-generate-payments.c
b/src/merchant-tools/taler-merchant-generate-payments.c
index db27b21..1878ab7 100644
--- a/src/merchant-tools/taler-merchant-generate-payments.c
+++ b/src/merchant-tools/taler-merchant-generate-payments.c
@@ -276,6 +276,11 @@ run (void *cls,
order_worth_5_track,
order_worth_5_unaggregated);
+ /* Will be freed by testing-lib. */
+ GNUNET_assert
+ (GNUNET_OK == GNUNET_CURL_append_header
+ (is->ctx, APIKEY_SANDBOX));
+
struct TALER_TESTING_Command commands[] = {
CMD_TRANSFER_TO_EXCHANGE
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant] branch master updated: Fix last change.,
gnunet <=