[taler-merchant] branch master updated: fix URL generation

[gnunet]

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

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new f8411e9  fix URL generation
f8411e9 is described below

commit f8411e903f34822168f85a992fe95d7dda418004
Author: Florian Dold <address@hidden>
AuthorDate: Fri Nov 1 16:55:08 2019 +0100

    fix URL generation
---
 src/backend/taler-merchant-httpd_proposal.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_proposal.c 
b/src/backend/taler-merchant-httpd_proposal.c
index 06788f0..89f5b11 100644
--- a/src/backend/taler-merchant-httpd_proposal.c
+++ b/src/backend/taler-merchant-httpd_proposal.c
@@ -176,13 +176,19 @@ make_merchant_base_url (struct MHD_Connection 
*connection, const
 
   uri_path = MHD_lookup_connection_value (connection, MHD_HEADER_KIND,
                                           "X-Forwarded-Prefix");
-
   if (NULL != uri_path)
-    TALER_buffer_write_path (&buf, uri_path);
+  {
+    /* Currently the merchant backend is only supported at the root of the 
path,
+     * this might change in the future.
+     */
+    GNUNET_assert (0);
+  }
+
+  TALER_buffer_write_path (&buf, "public");
 
   if (0 != strcmp (instance_id, "default"))
   {
-    TALER_buffer_write_path (&buf, "/instance/");
+    TALER_buffer_write_path (&buf, "/instances/");
     TALER_buffer_write_str (&buf, instance_id);
   }
   TALER_buffer_write_path (&buf, "");

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