Merge branch 'master' into tokens-payment

3 files changed, 12 insertions, 10 deletions

diff --git a/bootstrap b/bootstrap
index a2d0c3b5d..509c8a0c7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -8,12 +8,6 @@ if ! git --version >/dev/null; then
   exit 1
 fi
 
-if ! pandoc --version >/dev/null; then
-  echo "pandoc not installed"
-  exit 1
-fi
-
-
 echo "$0: Updating submodules"
 echo | git submodule update --init --force --remote
 
@@ -42,7 +36,7 @@ fi
 # Generate Makefile.am in contrib/
 cd contrib
 rm -f Makefile.am
-find wallet-core/aml-backoffice/ -type f -printf '  %p \\\n' | sort > Makefile.am.ext
+find wallet-core/aml-backoffice/ -type f | sort | awk '{print "  " $1 " \\" }' > Makefile.am.ext
 # Remove extra '\' at the end of the file
 truncate -s -2 Makefile.am.ext
 cat Makefile.am.in Makefile.am.ext >> Makefile.am
diff --git a/src/exchange/taler-exchange-httpd_config.c b/src/exchange/taler-exchange-httpd_config.c
index e17a9a050..257dfa6ba 100644
--- a/src/exchange/taler-exchange-httpd_config.c
+++ b/src/exchange/taler-exchange-httpd_config.c
@@ -33,10 +33,17 @@ TEH_handler_config (struct TEH_RequestContext *rc,
                     const char *const args[])
 {
   static struct MHD_Response *resp;
+  static struct GNUNET_TIME_Absolute a;
 
+  (void) args;
+  if ( (GNUNET_TIME_absolute_is_past (a)) &&
+       (NULL != resp) )
+  {
+    MHD_destroy_response (resp);
+    resp = NULL;
+  }
   if (NULL == resp)
   {
-    struct GNUNET_TIME_Absolute a;
     struct GNUNET_TIME_Timestamp km;
     char dat[128];
 
@@ -62,7 +69,8 @@ TEH_handler_config (struct TEH_RequestContext *rc,
       GNUNET_JSON_pack_string ("name",
                                "taler-exchange"),
       GNUNET_JSON_pack_string ("implementation",
-                               "urn:net:taler:specs:taler-exchange:c-reference"),
+                               "urn:net:taler:specs:taler-exchange:c-reference")
+      ,
       GNUNET_JSON_pack_string ("version",
                                EXCHANGE_PROTOCOL_VERSION));
 
diff --git a/src/exchange/taler-exchange-httpd_config.h b/src/exchange/taler-exchange-httpd_config.h
index c0a14104a..068f51d41 100644
--- a/src/exchange/taler-exchange-httpd_config.h
+++ b/src/exchange/taler-exchange-httpd_config.h
@@ -41,7 +41,7 @@
  *
  * Returned via both /config and /keys endpoints.
  */
-#define EXCHANGE_PROTOCOL_VERSION "19:1:2"
+#define EXCHANGE_PROTOCOL_VERSION "19:2:2"
 
 
 /**