[taler-merchant] branch master updated: ignore timeout in html requests to GET /orders/

[gnunet]

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

jonathan-buchanan pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new ef6fed1  ignore timeout in html requests to GET /orders/
ef6fed1 is described below

commit ef6fed10b06bef0ba7d9003b594c8e994665229f
Author: Jonathan Buchanan <jonathan.russ.buchanan@gmail.com>
AuthorDate: Sun Aug 9 21:29:33 2020 -0400

    ignore timeout in html requests to GET /orders/
---
 src/backend/taler-merchant-httpd_get-orders-ID.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c 
b/src/backend/taler-merchant-httpd_get-orders-ID.c
index afe452a..fc551a1 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -951,7 +951,8 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
       long_poll_timeout_s = MHD_lookup_connection_value (connection,
                                                          MHD_GET_ARGUMENT_KIND,
                                                          "timeout");
-      if (NULL != long_poll_timeout_s)
+      if ((NULL != long_poll_timeout_s) &&
+          !god->generate_html)
       {
         unsigned int timeout;
 

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