romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-30 03:07:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

openssl-quic: check results better

Browse source 
Fail on errors from SSL_handle_events().
Force quit Caddy test instance that is left hanging longer with
openssl-quic tests for unknown reasons.

Reported in Joshua's sarif data

Closes #18720
This commit is contained in:
Stefan Eissing 2025-09-25 11:49:45 +02:00 • committed by Daniel Stenberg
parent 9e8b05fb99
commit b0f6593219
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/vquic/curl_osslq.c
View file

@ -1421,12 +1421,16 @@ static CURLcode cf_progress_ingress(struct Curl_cfilter *cf,
if(!snew)
break;
(void)cf_osslq_h3conn_add_stream(&ctx->h3, snew, cf, data);
result = cf_osslq_h3conn_add_stream(&ctx->h3, snew, cf, data);
if(result)
goto out;
}
if(!SSL_handle_events(ctx->tls.ossl.ssl)) {
int detail = SSL_get_error(ctx->tls.ossl.ssl, 0);
result = cf_osslq_ssl_err(cf, data, detail, CURLE_RECV_ERROR);
if(result)
goto out;
}
if(ctx->h3.conn) {

5
tests/http/testenv/caddy.py
View file

@ -117,7 +117,10 @@ class Caddy:
self._mkpath(self._tmp_dir)
if self._process:
self._process.terminate()
self._process.wait(timeout=2)
try:
self._process.wait(timeout=1)
except Exception:
self._process.kill()
self._process = None
return not wait_dead or self.wait_dead(timeout=timedelta(seconds=5))
return True