Skip to content

Commit

Permalink
QUIC APL: Ensure tick inhibition is not used during blocking
Browse files Browse the repository at this point in the history
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #21484)
  • Loading branch information
hlandau authored and mattcaswell committed Jul 31, 2023
1 parent 5904a0a commit cae02d2
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions ssl/quic/quic_impl.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ static int block_until_pred(QUIC_CONNECTION *qc,

assert(qc->ch != NULL);

/*
* Any attempt to block auto-disables tick inhibition as otherwise we will
* hang around forever.
*/
ossl_quic_channel_set_inhibit_tick(qc->ch, 0);

rtor = ossl_quic_channel_get_reactor(qc->ch);
return ossl_quic_reactor_block_until_pred(rtor, pred, pred_arg, flags,
qc->mutex);
Expand Down

0 comments on commit cae02d2

Please sign in to comment.