[taler-merchant] branch master updated: expose /public/config endpoint (#5939)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 45e65f8  expose /public/config endpoint (#5939)
45e65f8 is described below

commit 45e65f85429ad4e78d0cb2ba43923468f0429ae5
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Apr 4 17:24:40 2020 +0200

    expose /public/config endpoint (#5939)
---
 src/backend/taler-merchant-httpd.c        | 3 +++
 src/backend/taler-merchant-httpd_config.c | 6 +++---
 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 46b60fd..ba15625 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 8fc6270..10a9160 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 1bb6016..320399c 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

-- 
To stop receiving notification emails like this one, please contact
address@hidden.