From: x2018 <xkernel.wang@foxmail.com>
Date: Sat, 1 Nov 2025 15:28:07 +0000 (+0800)
Subject: vtls: properly handle SSL shutdown timeout
X-Git-Tag: curl-8_17_0~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2a12fcbdbe9fa515e0389995318f02f898a4b0b;p=thirdparty%2Fcurl.git

vtls: properly handle SSL shutdown timeout

Closes #19323
---

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 22d820b160..df0449cbee 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -1858,7 +1858,8 @@ static CURLcode vtls_shutdown_blocking(struct Curl_cfilter *cf,
     if(timeout_ms < 0) {
       /* no need to continue if time is already up */
       failf(data, "SSL shutdown timeout");
-      return CURLE_OPERATION_TIMEDOUT;
+      result = CURLE_OPERATION_TIMEDOUT;
+      goto out;
     }
 
     result = connssl->ssl_impl->shut_down(cf, data, send_shutdown, done);