From ce82d1b9fa18fe71bb596a9ceb2af399dd12de42 Mon Sep 17 00:00:00 2001 From: Mahavir Jain Date: Tue, 28 Jul 2020 20:27:27 +0530 Subject: [PATCH 1/2] nghttp2: upgrade to v1.41.0 release Detailed changelog: https://github.com/nghttp2/nghttp2/releases/tag/v1.41.0 Closes: https://github.com/espressif/esp-idf/issues/4883 Closes IDFGH-2821 --- components/nghttp/nghttp2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/nghttp/nghttp2 b/components/nghttp/nghttp2 index 3bcc416e13..8f7b008b15 160000 --- a/components/nghttp/nghttp2 +++ b/components/nghttp/nghttp2 @@ -1 +1 @@ -Subproject commit 3bcc416e13cc790e2fb45fcfe9111d38609c5032 +Subproject commit 8f7b008b158e12de0e58247afd170f127dbb6456 From b0e119640d029a7d4ef7f3c506d767b20b4352b7 Mon Sep 17 00:00:00 2001 From: Vikram Dattu Date: Tue, 17 Mar 2020 12:45:19 +0530 Subject: [PATCH 2/2] Fixed broken http2_request example. Implementation of `esp_tls_conn_new_sync` now uses timeout_ms value to give up retries. Specified this value to be 10 sec. (10 * 1000 ms). Signed-off-by: Vikram Dattu --- examples/protocols/http2_request/components/sh2lib/sh2lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/protocols/http2_request/components/sh2lib/sh2lib.c b/examples/protocols/http2_request/components/sh2lib/sh2lib.c index 4447a12803..18e819f6d1 100644 --- a/examples/protocols/http2_request/components/sh2lib/sh2lib.c +++ b/examples/protocols/http2_request/components/sh2lib/sh2lib.c @@ -242,7 +242,8 @@ int sh2lib_connect(struct sh2lib_handle *hd, const char *uri) esp_tls_cfg_t tls_cfg = { .alpn_protos = proto, .non_block = true, - }; + .timeout_ms = 10 * 1000, + }; if ((hd->http2_tls = esp_tls_conn_http_new(uri, &tls_cfg)) == NULL) { ESP_LOGE(TAG, "[sh2-connect] esp-tls connection failed"); goto error;