VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-01 16:41:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow up to r1836032: better flush limits checks and description.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1884304 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2020-12-11 11:33:00 +00:00
parent 4e4cf19efe
commit 2bc917d4e9
4 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/util_filter.c
View File

@ -1104,7 +1104,7 @@ AP_DECLARE(apr_status_t) ap_filter_reinstate_brigade(ap_filter_t *f,
* sent to the client.)
*
* c) The brigade contains at least flush_max_pipelined EOR buckets: do
* blocking writes until the last EOR above flush_max_pipelined.
* blocking writes until after the last EOR above flush_max_pipelined.
* (The point of this rule is to prevent too many FDs being kept open
* by pipelined requests, possibly allowing a DoS).
*
@ -1140,14 +1140,15 @@ AP_DECLARE(apr_status_t) ap_filter_reinstate_brigade(ap_filter_t *f,
}
if (APR_BUCKET_IS_FLUSH(bucket)
|| memory_bytes_in_brigade >= conf->flush_max_threshold
|| eor_buckets_in_brigade >= conf->flush_max_pipelined) {
|| (memory_bytes_in_brigade > conf->flush_max_threshold)
|| (conf->flush_max_pipelined >= 0
&& eor_buckets_in_brigade > conf->flush_max_pipelined)) {
/* this segment of the brigade MUST be sent before returning. */
if (APLOGctrace6(f->c)) {
char *reason = APR_BUCKET_IS_FLUSH(bucket) ?
"FLUSH bucket" :
(memory_bytes_in_brigade >= conf->flush_max_threshold) ?
(memory_bytes_in_brigade > conf->flush_max_threshold) ?
"max threshold" : "max requests in pipeline";
ap_log_cerror(APLOG_MARK, APLOG_TRACE6, 0, f->c,
"will flush because of %s", reason);