libcurl: update to 8.3.0

1 files changed, 7 insertions, 11 deletions

diff --git a/libs/libcurl/src/vtls/rustls.c b/libs/libcurl/src/vtls/rustls.c
index d928b9d08a..989954bf46 100644
--- a/libs/libcurl/src/vtls/rustls.c
+++ b/libs/libcurl/src/vtls/rustls.c
@@ -104,10 +104,6 @@ read_cb(void *userdata, uint8_t *buf, uintptr_t len, uintptr_t *out_n)
       ret = EINVAL;

   }

   *out_n = (int)nread;

-  /*

-  DEBUGF(LOG_CF(io_ctx->data, io_ctx->cf, "cf->next recv(len=%zu) -> %zd, %d",

-                len, nread, result));

-  */

   return ret;

 }

 

@@ -128,7 +124,7 @@ write_cb(void *userdata, const uint8_t *buf, uintptr_t len, uintptr_t *out_n)
   }

   *out_n = (int)nwritten;

   /*

-  DEBUGF(LOG_CF(io_ctx->data, io_ctx->cf, "cf->next send(len=%zu) -> %zd, %d",

+  CURL_TRC_CFX(io_ctx->data, io_ctx->cf, "cf->next send(len=%zu) -> %zd, %d",

                 len, nwritten, result));

   */

   return ret;

@@ -267,8 +263,8 @@ cr_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
   }

 

 out:

-  DEBUGF(LOG_CF(data, cf, "cf_recv(len=%zu) -> %zd, %d",

-                plainlen, nread, *err));

+  CURL_TRC_CF(data, cf, "cf_recv(len=%zu) -> %zd, %d",

+              plainlen, nread, *err);

   return nread;

 }

 

@@ -302,7 +298,7 @@ cr_send(struct Curl_cfilter *cf, struct Curl_easy *data,
   DEBUGASSERT(backend);

   rconn = backend->conn;

 

-  DEBUGF(LOG_CF(data, cf, "cf_send: %ld plain bytes", plainlen));

+  CURL_TRC_CF(data, cf, "cf_send: %ld plain bytes", plainlen);

 

   io_ctx.cf = cf;

   io_ctx.data = data;

@@ -327,8 +323,8 @@ cr_send(struct Curl_cfilter *cf, struct Curl_easy *data,
     io_error = rustls_connection_write_tls(rconn, write_cb, &io_ctx,

                                            &tlswritten);

     if(io_error == EAGAIN || io_error == EWOULDBLOCK) {

-      DEBUGF(LOG_CF(data, cf, "cf_send: EAGAIN after %zu bytes",

-                    tlswritten_total));

+      CURL_TRC_CF(data, cf, "cf_send: EAGAIN after %zu bytes",

+                  tlswritten_total);

       *err = CURLE_AGAIN;

       return -1;

     }

@@ -344,7 +340,7 @@ cr_send(struct Curl_cfilter *cf, struct Curl_easy *data,
       *err = CURLE_WRITE_ERROR;

       return -1;

     }

-    DEBUGF(LOG_CF(data, cf, "cf_send: wrote %zu TLS bytes", tlswritten));

+    CURL_TRC_CF(data, cf, "cf_send: wrote %zu TLS bytes", tlswritten);

     tlswritten_total += tlswritten;

   }