b0f6593219
Stefan Eissing
2025-09-25
Subject
openssl-quic: check results better
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/vquic/curl_osslq.c+5 -1
| @@ -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) { | |
tests/http/testenv/caddy.py+4 -1
| @@ -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 | |