diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 3 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_config.c | 6 | ||||
| -rw-r--r-- | src/include/taler_merchant_service.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 46b60fd1..ba15625b 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -1292,6 +1292,9 @@ url_handler (void *cls, { "/poll-payment", MHD_HTTP_METHOD_GET, "text/plain", NULL, 0, &MH_handler_poll_payment, MHD_HTTP_OK}, + { "/config", MHD_HTTP_METHOD_GET, "text/plain", + NULL, 0, + &MH_handler_config, MHD_HTTP_OK}, {NULL, NULL, NULL, NULL, 0, 0 } }; static struct TMH_RequestHandler h404 = { diff --git a/src/backend/taler-merchant-httpd_config.c b/src/backend/taler-merchant-httpd_config.c index 8fc62708..10a91609 100644 --- a/src/backend/taler-merchant-httpd_config.c +++ b/src/backend/taler-merchant-httpd_config.c @@ -41,10 +41,10 @@ * versioning uses either. * * When changing this version, you likely want to also update - * #TALER_PROTOCOL_CURRENT and #TALER_PROTOCOL_AGE in + * #MERCHANT_PROTOCOL_CURRENT and #MERCHANT_PROTOCOL_AGE in * TBD.c! // FIXME: update comment once libtalermerchant looks at version! */ -#define TALER_PROTOCOL_VERSION "0:0:0" +#define MERCHANT_PROTOCOL_VERSION "0:0:0" /** @@ -75,7 +75,7 @@ MH_handler_config (struct TMH_RequestHandler *rh, MHD_HTTP_OK, "{s:s, s:s}", "currency", TMH_currency, - "version", TALER_PROTOCOL_VERSION); + "version", MERCHANT_PROTOCOL_VERSION); } diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h index 1bb60164..320399cb 100644 --- a/src/include/taler_merchant_service.h +++ b/src/include/taler_merchant_service.h @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014-2017 INRIA + Copyright (C) 2014-2020 Taler Systems SA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software |