Skip to content

Commit

Permalink
*) mod_http2:
Browse files Browse the repository at this point in the history
     h2_mplx: fix debug check when stream was not found

     A "this should never happen" check logic was wrong when looking
     *why* a stream that SHOULD be there was not. The loop did not
     properly match streams in "purge" state.

     The log warning issued has never been reported, so this code
     seems to never actually do anything. Still fix the logic to
     do what it is intended to.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1921066 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
icing committed Oct 1, 2024
1 parent 52a5a0e commit 4c6d51c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion modules/http2/h2_mplx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,8 @@ static void s_c2_done(h2_mplx *m, conn_rec *c2, h2_conn_ctx_t *conn_ctx)
int i;

for (i = 0; i < m->spurge->nelts; ++i) {
if (stream == APR_ARRAY_IDX(m->spurge, i, h2_stream*)) {
stream = APR_ARRAY_IDX(m->spurge, i, h2_stream*);
if (stream && (stream->id == conn_ctx->stream_id)) {
ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, c2,
H2_STRM_LOG(APLOGNO(03517), stream, "already in spurge"));
ap_assert("stream should not be in spurge" == NULL);
Expand Down

0 comments on commit 4c6d51c

Please sign in to comment.