[taler-merchant] branch master updated: gateway timeout is not really a protocol violation

[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 534edf2d gateway timeout is not really a protocol violation
     new a0757950 Merge branch 'master' of git+ssh://git.taler.net/merchant
534edf2d is described below

commit 534edf2d0fc0e2a03736b9251703bad2ffaf14f7
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed May 18 18:34:14 2022 +0200

    gateway timeout is not really a protocol violation
---
 contrib/merchant-backoffice               | 2 +-
 src/lib/merchant_api_merchant_get_order.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
index 1d7ee55e..182cdfff 160000
--- a/contrib/merchant-backoffice
+++ b/contrib/merchant-backoffice
@@ -1 +1 @@
-Subproject commit 1d7ee55ea115b91687c203a8f084ea852867b1f0
+Subproject commit 182cdfffa1d4b6f2bb3543d30cfa7509e73bda03
diff --git a/src/lib/merchant_api_merchant_get_order.c 
b/src/lib/merchant_api_merchant_get_order.c
index 0bb6b6c4..167e46be 100644
--- a/src/lib/merchant_api_merchant_get_order.c
+++ b/src/lib/merchant_api_merchant_get_order.c
@@ -400,6 +400,14 @@ handle_merchant_order_get_finished (void *cls,
               NULL);
     TALER_MERCHANT_merchant_order_get_cancel (omgh);
     return;
+  case MHD_HTTP_GATEWAY_TIMEOUT:
+    hr.ec = TALER_JSON_get_error_code (json);
+    hr.hint = TALER_JSON_get_error_hint (json);
+    omgh->cb (omgh->cb_cls,
+              &hr,
+              NULL);
+    TALER_MERCHANT_merchant_order_get_cancel (omgh);
+    return;
   default:
     hr.ec = TALER_JSON_get_error_code (json);
     hr.hint = TALER_JSON_get_error_hint (json);

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.