VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-15 23:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

mod_http2, fix keepalive timeout on reset requests

Browse Source 
Count failed requests that are RST'ed, so that the
connection enters keepalive timeout instead of the
regular timeout if the first request fails.

Add tests to verify.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1921805 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Eissing
2024-11-07 12:02:41 +00:00
parent f5c4355420
commit d94933b89f
3 changed files with 69 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/http2/h2_session.c
View File

@ -326,6 +326,10 @@ static int on_header_cb(nghttp2_session *ngh2, const nghttp2_frame *frame,
* with an informative HTTP error response like 413. But of the
* client is too wrong, we RESET the stream */
stream->request_headers_failed > 100)) {
ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, session->c1,
H2_SSSN_STRM_MSG(session, frame->hd.stream_id,
"RST stream, header failures: %d"),
(int)stream->request_headers_failed);
return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
}
return 0;
@ -1498,7 +1502,8 @@ static void h2_session_ev_conn_error(h2_session *session, int arg, const char *m
default:
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c1,
H2_SSSN_LOG(APLOGNO(03401), session,
"conn error -> shutdown"));
"conn error -> shutdown, remote.emitted=%d"),
(int)session->remote.emitted_count);
h2_session_shutdown(session, arg, msg, 0);
break;
}
@ -1591,9 +1596,7 @@ static void ev_stream_created(h2_session *session, h2_stream *stream)
static void ev_stream_open(h2_session *session, h2_stream *stream)
{
if (H2_STREAM_CLIENT_INITIATED(stream->id)) {
++session->remote.emitted_count;
if (stream->id > session->remote.emitted_max) {
session->remote.emitted_max = stream->id;
if (stream->id > session->remote.accepted_max) {
session->local.accepted_max = stream->id;
}
}
@ -1890,7 +1893,8 @@ apr_status_t h2_session_process(h2_session *session, int async,
/* Not an async mpm, we must continue waiting
* for client data to arrive until the configured
* server Timeout/KeepAliveTimeout happens */
apr_time_t timeout = (session->open_streams == 0)?
apr_time_t timeout = ((session->open_streams == 0) &&
session->remote.emitted_count)?
session->s->keep_alive_timeout :
session->s->timeout;
ap_log_cerror(APLOG_MARK, APLOG_TRACE2, status, c,

5
modules/http2/h2_stream.c
View File

@ -761,6 +761,11 @@ apr_status_t h2_stream_add_header(h2_stream *stream,
}
else if (H2_SS_IDLE == stream->state) {
if (!stream->rtmp) {
if (H2_STREAM_CLIENT_INITIATED(stream->id)) {
++stream->session->remote.emitted_count;
if (stream->id > stream->session->remote.emitted_max)
session->remote.emitted_max = stream->id;
}
stream->rtmp = h2_request_create(stream->id, stream->pool,
NULL, NULL, NULL, NULL, NULL);
}