merchant

commit 45e65f85429ad4e78d0cb2ba43923468f0429ae5
parent 86688d67ef887a46d74365a57f04d9498bc939d6
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat,  4 Apr 2020 17:24:40 +0200

expose /public/config endpoint (#5939)

Diffstat:
M
src/backend/taler-merchant-httpd.c
 | 
3
+++
M
src/backend/taler-merchant-httpd_config.c
 | 
6
+++---
M
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
@@ -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
@@ -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
@@ -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