mirror of
https://github.com/nginx/nginx.git
synced 2024-11-21 16:28:40 +00:00
Merge branch 'master' into Feature/1-ssl-custom-extension
This commit is contained in:
commit
0283624f4a
@ -9,8 +9,8 @@
|
||||
#define _NGINX_H_INCLUDED_
|
||||
|
||||
|
||||
#define nginx_version 1027002
|
||||
#define NGINX_VERSION "1.27.2"
|
||||
#define nginx_version 1027003
|
||||
#define NGINX_VERSION "1.27.3"
|
||||
#define NGINX_VER "nginx/" NGINX_VERSION
|
||||
|
||||
#ifdef NGX_BUILD
|
||||
|
@ -631,13 +631,12 @@ ngx_quic_resend_frames(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx)
|
||||
case NGX_QUIC_FT_STREAM:
|
||||
qs = ngx_quic_find_stream(&qc->streams.tree, f->u.stream.stream_id);
|
||||
|
||||
if (qs) {
|
||||
if (qs->send_state == NGX_QUIC_STREAM_SEND_RESET_SENT
|
||||
|| qs->send_state == NGX_QUIC_STREAM_SEND_RESET_RECVD)
|
||||
{
|
||||
ngx_quic_free_frame(c, f);
|
||||
break;
|
||||
}
|
||||
if (qs == NULL
|
||||
|| qs->send_state == NGX_QUIC_STREAM_SEND_RESET_SENT
|
||||
|| qs->send_state == NGX_QUIC_STREAM_SEND_RESET_RECVD)
|
||||
{
|
||||
ngx_quic_free_frame(c, f);
|
||||
break;
|
||||
}
|
||||
|
||||
/* fall through */
|
||||
|
Loading…
Reference in New Issue
Block a user