46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
Index: modules/http2/h2_session.c
|
|
===================================================================
|
|
--- a/modules/http2/h2_session.c (revision 1916778)
|
|
+++ b/modules/http2/h2_session.c (revision 1916779)
|
|
@@ -319,9 +319,13 @@
|
|
|
|
status = h2_stream_add_header(stream, (const char *)name, namelen,
|
|
(const char *)value, valuelen);
|
|
- if (status != APR_SUCCESS
|
|
- && (!stream->rtmp
|
|
- || stream->rtmp->http_status == H2_HTTP_STATUS_UNSET)) {
|
|
+ if (status != APR_SUCCESS &&
|
|
+ (!stream->rtmp ||
|
|
+ stream->rtmp->http_status == H2_HTTP_STATUS_UNSET ||
|
|
+ /* We accept a certain amount of failures in order to reply
|
|
+ * with an informative HTTP error response like 413. But if the
|
|
+ * client is too wrong, we fail the request a RESET of the stream */
|
|
+ stream->request_headers_failed > 100)) {
|
|
return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
|
|
}
|
|
return 0;
|
|
Index: modules/http2/h2_stream.c
|
|
===================================================================
|
|
--- a/modules/http2/h2_stream.c (revision 1916778)
|
|
+++ b/modules/http2/h2_stream.c (revision 1916779)
|
|
@@ -813,6 +813,7 @@
|
|
|
|
cleanup:
|
|
if (error) {
|
|
+ ++stream->request_headers_failed;
|
|
set_error_response(stream, error);
|
|
return APR_EINVAL;
|
|
}
|
|
Index: modules/http2/h2_stream.h
|
|
===================================================================
|
|
--- a/modules/http2/h2_stream.h (revision 1916778)
|
|
+++ b/modules/http2/h2_stream.h (revision 1916779)
|
|
@@ -91,6 +91,7 @@
|
|
struct h2_request *rtmp; /* request being assembled */
|
|
apr_table_t *trailers_in; /* optional, incoming trailers */
|
|
int request_headers_added; /* number of request headers added */
|
|
+ int request_headers_failed; /* number of request headers failed to add */
|
|
|
|
#if AP_HAS_RESPONSE_BUCKETS
|
|
ap_bucket_response *response; /* the final, non-interim response or NULL */
|