diff options
author | Florian Dold <florian.dold@gmail.com> | 2019-10-05 23:33:57 +0530 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2019-10-05 23:33:57 +0530 |
commit | 6eb1f758ead6eca02803cadf3017101ebdc338e0 (patch) | |
tree | 1ee01fec5edc95e1dc89f29204b21d38a6704d7b | |
parent | 29854611d607d130c80b524642421e554ba1d984 (diff) | |
download | merchant-6eb1f758ead6eca02803cadf3017101ebdc338e0.tar.gz merchant-6eb1f758ead6eca02803cadf3017101ebdc338e0.tar.bz2 merchant-6eb1f758ead6eca02803cadf3017101ebdc338e0.zip |
support http for taler://pay
-rw-r--r-- | src/backend/taler-merchant-httpd_check-payment.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/backend/taler-merchant-httpd_check-payment.c b/src/backend/taler-merchant-httpd_check-payment.c index fc6cd15f..ee7c9289 100644 --- a/src/backend/taler-merchant-httpd_check-payment.c +++ b/src/backend/taler-merchant-httpd_check-payment.c @@ -58,6 +58,7 @@ make_taler_pay_uri (struct MHD_Connection *connection, const char *forwarded_host; const char *uri_path; const char *uri_instance_id; + const char *query; char *result; @@ -85,27 +86,22 @@ make_taler_pay_uri (struct MHD_Connection *connection, return NULL; } + if (GNUNET_YES == TALER_mhd_is_https (connection)) + query = ""; + else + query = "?insecure=1"; + GNUNET_assert (NULL != order_id); - if (NULL == session_id) - { - GNUNET_assert (0 < GNUNET_asprintf (&result, - "taler://pay/%s/%s/%s/%s", - host, - uri_path, - uri_instance_id, - order_id)); - } - else - { - GNUNET_assert (0 < GNUNET_asprintf (&result, - "taler://pay/%s/%s/%s/%s/%s", - host, - uri_path, - uri_instance_id, - order_id, - session_id)); - } + GNUNET_assert (0 < GNUNET_asprintf (&result, + "taler://pay/%s/%s/%s/%s%s%s%s", + host, + uri_path, + uri_instance_id, + order_id, + (session_id == NULL) ? "" : "/", + (session_id == NULL) ? "" : session_id, + query)); return result; } |