[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] 01/02: Reverting last change.
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] 01/02: Reverting last change. |
Date: |
Wed, 13 Jun 2018 18:04:06 +0200 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository merchant.
commit fad71ffebef5ccafd02cb13cf93b6f960fff2b0d
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Jun 13 17:51:53 2018 +0200
Reverting last change.
Custom HTTP headers will be added via a dedicate
function offered by the usual GNUnet-cURL stack.
---
src/lib/merchant_api_pay.c | 8 --------
src/lib/merchant_api_proposal.c | 8 --------
src/lib/merchant_api_track_transaction.c | 9 ---------
src/lib/merchant_api_track_transfer.c | 7 -------
src/merchant-tools/taler-merchant-generate-payments.c | 2 +-
5 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/src/lib/merchant_api_pay.c b/src/lib/merchant_api_pay.c
index 7340a0a..93b6478 100644
--- a/src/lib/merchant_api_pay.c
+++ b/src/lib/merchant_api_pay.c
@@ -475,7 +475,6 @@ request_pay_generic (struct GNUNET_CURL_Context *ctx,
json_t *pay_obj;
json_t *j_coins;
CURL *eh;
- struct curl_slist *list = NULL;
struct TALER_Amount total_fee;
struct TALER_Amount total_amount;
@@ -593,13 +592,6 @@ request_pay_generic (struct GNUNET_CURL_Context *ctx,
curl_easy_setopt (eh,
CURLOPT_POSTFIELDSIZE,
strlen (ph->json_enc)));
-
- list = curl_slist_append (list, "Authorization: ApiKey sandbox");
-
- GNUNET_assert (CURLE_OK ==
- curl_easy_setopt (eh,
- CURLOPT_HTTPHEADER,
- list));
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 f07ad17..72b44fa 100644
--- a/src/lib/merchant_api_proposal.c
+++ b/src/lib/merchant_api_proposal.c
@@ -215,7 +215,6 @@ TALER_MERCHANT_order_put (struct GNUNET_CURL_Context *ctx,
struct TALER_MERCHANT_ProposalOperation *po;
json_t *req;
CURL *eh;
- struct curl_slist *list = NULL;
po = GNUNET_new (struct TALER_MERCHANT_ProposalOperation);
po->ctx = ctx;
@@ -246,13 +245,6 @@ TALER_MERCHANT_order_put (struct GNUNET_CURL_Context *ctx,
curl_easy_setopt (eh,
CURLOPT_POSTFIELDSIZE,
strlen (po->json_enc)));
-
- list = curl_slist_append (list, "Authorization: ApiKey sandbox");
- GNUNET_assert (NULL != list);
- GNUNET_assert (CURLE_OK ==
- curl_easy_setopt (eh,
- CURLOPT_HTTPHEADER,
- list));
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 5462b9a..ae5d903 100644
--- a/src/lib/merchant_api_track_transaction.c
+++ b/src/lib/merchant_api_track_transaction.c
@@ -149,7 +149,6 @@ TALER_MERCHANT_track_transaction (struct
GNUNET_CURL_Context *ctx,
{
struct TALER_MERCHANT_TrackTransactionHandle *tdo;
CURL *eh;
- struct curl_slist *list = NULL;
char *base;
tdo = GNUNET_new (struct TALER_MERCHANT_TrackTransactionHandle);
@@ -171,14 +170,6 @@ TALER_MERCHANT_track_transaction (struct
GNUNET_CURL_Context *ctx,
curl_easy_setopt (eh,
CURLOPT_URL,
tdo->url));
- list = curl_slist_append (list,
- "Authorization: ApiKey sandbox");
-
- GNUNET_assert (CURLE_OK ==
- curl_easy_setopt (eh,
- CURLOPT_HTTPHEADER,
- list));
-
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 36fe8e6..7c78532 100644
--- a/src/lib/merchant_api_track_transfer.c
+++ b/src/lib/merchant_api_track_transfer.c
@@ -234,7 +234,6 @@ TALER_MERCHANT_track_transfer (struct GNUNET_CURL_Context
*ctx,
{
struct TALER_MERCHANT_TrackTransferHandle *tdo;
CURL *eh;
- struct curl_slist *list = NULL;
char *wtid_str;
wtid_str = GNUNET_STRINGS_data_to_string_alloc (wtid,
@@ -255,12 +254,6 @@ TALER_MERCHANT_track_transfer (struct GNUNET_CURL_Context
*ctx,
curl_easy_setopt (eh,
CURLOPT_URL,
tdo->url));
- list = curl_slist_append (list,
- "Authorization: ApiKey sandbox");
- GNUNET_assert (CURLE_OK ==
- curl_easy_setopt (eh,
- CURLOPT_HTTPHEADER,
- list));
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 58a4200..db27b21 100644
--- a/src/merchant-tools/taler-merchant-generate-payments.c
+++ b/src/merchant-tools/taler-merchant-generate-payments.c
@@ -570,7 +570,7 @@ main (int argc,
GNUNET_assert (GNUNET_SYSERR != result);
loglev = NULL;
- GNUNET_log_setup ("taler-merchant-generate-payments",
+ GNUNET_log_setup ("taler-merchant-generate-payments-new",
loglev,
logfile);
--
To stop receiving notification emails like this one, please contact
address@hidden