1 files changed, 10 insertions, 6 deletions

diff --git a/libs/libcurl/src/cf-h2-proxy.c b/libs/libcurl/src/cf-h2-proxy.c
index e978b83804..fe257c6457 100644
--- a/libs/libcurl/src/cf-h2-proxy.c
+++ b/libs/libcurl/src/cf-h2-proxy.c
@@ -32,7 +32,7 @@
 #include "connect.h"

 #include "curl_trc.h"

 #include "bufq.h"

-#include "dynbuf.h"

+#include "curlx/dynbuf.h"

 #include "dynhds.h"

 #include "http1.h"

 #include "http2.h"

@@ -277,6 +277,8 @@ static int proxy_h2_client_new(struct Curl_cfilter *cf,
 {

   struct cf_h2_proxy_ctx *ctx = cf->ctx;

   nghttp2_option *o;

+  nghttp2_mem mem = {NULL, Curl_nghttp2_malloc, Curl_nghttp2_free,

+                     Curl_nghttp2_calloc, Curl_nghttp2_realloc};

 

   int rc = nghttp2_option_new(&o);

   if(rc)

@@ -289,7 +291,7 @@ static int proxy_h2_client_new(struct Curl_cfilter *cf,
      HTTP field value. */

   nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation(o, 1);

 #endif

-  rc = nghttp2_session_client_new2(&ctx->h2, cbs, cf, o);

+  rc = nghttp2_session_client_new3(&ctx->h2, cbs, cf, o, &mem);

   nghttp2_option_del(o);

   return rc;

 }

@@ -617,7 +619,7 @@ static int proxy_h2_fr_print(const nghttp2_frame *frame,
                        frame->hd.flags & NGHTTP2_FLAG_ACK);

     case NGHTTP2_GOAWAY: {

       char scratch[128];

-      size_t s_len = sizeof(scratch)/sizeof(scratch[0]);

+      size_t s_len = CURL_ARRAYSIZE(scratch);

       size_t len = (frame->goaway.opaque_data_len < s_len) ?

         frame->goaway.opaque_data_len : s_len-1;

       if(len)

@@ -863,7 +865,9 @@ static int tunnel_recv_callback(nghttp2_session *session, uint8_t flags,
   if(nwritten < 0) {

     if(result != CURLE_AGAIN)

       return NGHTTP2_ERR_CALLBACK_FAILURE;

+#ifdef DEBUGBUILD

     nwritten = 0;

+#endif

   }

   DEBUGASSERT((size_t)nwritten == len);

   return 0;

@@ -1086,7 +1090,7 @@ out:
 

 static CURLcode cf_h2_proxy_connect(struct Curl_cfilter *cf,

                                     struct Curl_easy *data,

-                                    bool blocking, bool *done)

+                                    bool *done)

 {

   struct cf_h2_proxy_ctx *ctx = cf->ctx;

   CURLcode result = CURLE_OK;

@@ -1101,7 +1105,7 @@ static CURLcode cf_h2_proxy_connect(struct Curl_cfilter *cf,
 

   /* Connect the lower filters first */

   if(!cf->next->connected) {

-    result = Curl_conn_cf_connect(cf->next, data, blocking, done);

+    result = Curl_conn_cf_connect(cf->next, data, done);

     if(result || !*done)

       return result;

   }

@@ -1404,7 +1408,7 @@ static ssize_t cf_h2_proxy_send(struct Curl_cfilter *cf,
   ssize_t nwritten;

   CURLcode result;

 

-  (void)eos; /* TODO, maybe useful for blocks? */

+  (void)eos;

   if(ctx->tunnel.state != H2_TUNNEL_ESTABLISHED) {

     *err = CURLE_SEND_ERROR;

     return -1;