diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-06-25 12:35:57 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-06-25 12:35:57 +0200 |
commit | 2563686e6645024af62706014be11879d4122599 (patch) | |
tree | a6fd250b9d42c294580c3b93074d221da82c7475 /src/lib/merchant_api_track_transfer.c | |
parent | 633a9b641ec7bbd4a60bb97a335808d212a7ceb9 (diff) | |
download | merchant-2563686e6645024af62706014be11879d4122599.tar.gz merchant-2563686e6645024af62706014be11879d4122599.tar.bz2 merchant-2563686e6645024af62706014be11879d4122599.zip |
handle '/' at end of URLs when composing http requests in libtalermerchant
Diffstat (limited to 'src/lib/merchant_api_track_transfer.c')
-rw-r--r-- | src/lib/merchant_api_track_transfer.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/merchant_api_track_transfer.c b/src/lib/merchant_api_track_transfer.c index fcd208ce..f0b65903 100644 --- a/src/lib/merchant_api_track_transfer.c +++ b/src/lib/merchant_api_track_transfer.c @@ -30,6 +30,7 @@ #include "taler_merchant_service.h" #include <taler/taler_json_lib.h> #include <taler/taler_signatures.h> +#include "merchant_api_common.h" /** @@ -234,6 +235,7 @@ TALER_MERCHANT_track_transfer (struct GNUNET_CURL_Context *ctx, struct TALER_MERCHANT_TrackTransferHandle *tdo; CURL *eh; char *wtid_str; + char *base; wtid_str = GNUNET_STRINGS_data_to_string_alloc (wtid, sizeof (struct TALER_WireTransferIdentifierRawP)); @@ -242,12 +244,15 @@ TALER_MERCHANT_track_transfer (struct GNUNET_CURL_Context *ctx, tdo->cb = track_transfer_cb; // very last to be called tdo->cb_cls = track_transfer_cb_cls; /* TODO: do we need to escape 'exchange_uri' here? */ + base = MAH_path_to_url_ (backend_uri, + "/track/transfer"); GNUNET_asprintf (&tdo->url, - "%s/track/transfer?wtid=%s&exchange=%s&instance=%s", - backend_uri, + "%s?wtid=%s&exchange=%s&instance=%s", + base, wtid_str, exchange_uri, instance); + GNUNET_free (base); GNUNET_free (wtid_str); eh = curl_easy_init (); GNUNET_assert (CURLE_OK == |