From 4a51e331051e3fa5be10f4962c3834b524f58ab0 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 23 Feb 2019 14:47:44 +0100 Subject: actually disable 100 continue --- ChangeLog | 3 +++ src/lib/exchange_api_curl_defaults.c | 21 --------------------- src/lib/exchange_api_handle.c | 5 ++++- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48bb761f7..77fd48cff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Sat Feb 23 14:47:12 CET 2019 + Actually disable 100 CONTINUE. -CG + Sun Aug 19 15:15:48 CEST 2018 Increase various limits and rework transaction scopes to improve scalability. -CG diff --git a/src/lib/exchange_api_curl_defaults.c b/src/lib/exchange_api_curl_defaults.c index 1a25e564e..3ac1dfdbe 100644 --- a/src/lib/exchange_api_curl_defaults.c +++ b/src/lib/exchange_api_curl_defaults.c @@ -55,26 +55,5 @@ TEL_curl_easy_get (const char *url) CURLOPT_TCP_FASTOPEN, 1L)); #endif - { - /* Unfortunately libcurl needs chunk to be alive until after - curl_easy_perform. To avoid manual cleanup, we keep - one static list here. */ - static struct curl_slist *chunk = NULL; - if (NULL == chunk) - { - /* With POST requests, we do not want to wait for the - "100 Continue" response, as our request bodies are usually - small and directy sending them saves us a round trip. - - Clearing the expect header like this disables libcurl's - default processing of the header. - - Disabling this header is safe for other HTTP methods, thus - we don't distinguish further before setting it. */ - chunk = curl_slist_append (chunk, "Expect:"); - } - GNUNET_assert (CURLE_OK == curl_easy_setopt (eh, CURLOPT_HTTPHEADER, chunk)); - } - return eh; } diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c index 158afd56f..986bcc4c1 100644 --- a/src/lib/exchange_api_handle.c +++ b/src/lib/exchange_api_handle.c @@ -1740,7 +1740,10 @@ TALER_EXCHANGE_connect TALER_LOG_DEBUG ("Connecting to the exchange (%s)\n", url); - + /* Disable 100 continue processing */ + GNUNET_break (GNUNET_OK == + GNUNET_CURL_append_header (ctx, + "Expect:")); exchange = GNUNET_new (struct TALER_EXCHANGE_Handle); exchange->ctx = ctx; exchange->url = GNUNET_strdup (url); -- cgit v1.2.3 From f32c8f9be161ffbfed8d2a85f309ff208863d9e2 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Fri, 8 Mar 2019 13:48:52 +0100 Subject: Manual. --- doc/taler-exchange.texi | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/taler-exchange.texi b/doc/taler-exchange.texi index 50a0535ec..917e70898 100644 --- a/doc/taler-exchange.texi +++ b/doc/taler-exchange.texi @@ -472,14 +472,17 @@ ENABLE for each account whether it should be used, and for what [account-1] URL = "payto://sepa/CH9300762011623852957" WIRE_RESPONSE = $@{TALER_CONFIG_HOME@}/account-1.json -PLUGIN = ebics + +# Currently, only the 'taler_bank' plugin is implemented. +PLUGIN = # Use for exchange-aggregator (outgoing transfers) ENABLE_DEBIT = YES # Use for exchange-wirewatch (and listed in /wire) ENABLE_CREDIT = YES -# ... add authentication options here +# Authentication options for the chosen plugin go here. +# (Next sections have examples of authentication mechanisms) @end example The command line tool @cite{taler-exchange-wire} is used to create @@ -520,8 +523,14 @@ account at the bank. @setsyntax ini @example -[account-2] -URL = "payto://test/localhost:8080" +[account-1] + +# Bank account details here.. +# .. + +# Authentication options for the taler_bank plugin below: + +TALER_BANK_AUTH_METHOD = basic USERNAME = exchange PASSWORD = super-secure @end example -- cgit v1.2.3 From 91b794f09a2ff0b73a095821eec5c02eb3a5fc7d Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Fri, 8 Mar 2019 13:58:58 +0100 Subject: Remove useless and possibly misleading information. --- doc/taler-exchange.texi | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/taler-exchange.texi b/doc/taler-exchange.texi index 917e70898..ce8f9dd9c 100644 --- a/doc/taler-exchange.texi +++ b/doc/taler-exchange.texi @@ -512,9 +512,7 @@ requests. The @code{taler_bank} plugin implements the wire method ``x-taler-bank''. -The format of the @code{payto://} URL is @code{payto://x-taler-bank/HOSTNAME:PORT}, -possibly followed by other parameters like the amount and wire transfer subject -as per the @code{payto://} standard. +The format of the @code{payto://} URL is @code{payto://x-taler-bank/HOSTNAME:PORT}. For basic authentication, the @code{taler_bank} plugin only supports simple password-based authentication. For this, the configuration -- cgit v1.2.3 From 4405438d9c2db21be566a57a57b5eeeaf294bbc9 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Fri, 8 Mar 2019 14:01:09 +0100 Subject: detail --- doc/taler-exchange.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/taler-exchange.texi b/doc/taler-exchange.texi index ce8f9dd9c..4e6a0fb96 100644 --- a/doc/taler-exchange.texi +++ b/doc/taler-exchange.texi @@ -512,7 +512,7 @@ requests. The @code{taler_bank} plugin implements the wire method ``x-taler-bank''. -The format of the @code{payto://} URL is @code{payto://x-taler-bank/HOSTNAME:PORT}. +The format of the @code{payto://} URL is @code{payto://x-taler-bank/HOSTNAME[:PORT]}. For basic authentication, the @code{taler_bank} plugin only supports simple password-based authentication. For this, the configuration -- cgit v1.2.3