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

mod_proxy_fcgi: limit the flush buckets inserted when flushpackets=on|auto

Browse Source 
This commit is a follow up of r1802040 based on Jacob's
feedback, namely inserting the FLUSH buckets only when
really needed and useful, not always.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1807876 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Luca Toscano
2017-09-09 10:24:19 +00:00
parent 567e64e34e
commit 449105a615
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/proxy/mod_proxy_fcgi.c
View File

@ -667,6 +667,7 @@ static apr_status_t dispatch(proxy_conn_rec *conn, proxy_dir_conf *conf,
apr_bucket *b; apr_bucket *b;
unsigned char plen; unsigned char plen;
unsigned char type, version; unsigned char type, version;
int mayflush = 0;
/* First, we grab the header... */ /* First, we grab the header... */
rv = get_data_full(conn, (char *) farray, AP_FCGI_HEADER_LEN); rv = get_data_full(conn, (char *) farray, AP_FCGI_HEADER_LEN);
@ -795,6 +796,7 @@ recv_again:
*err = "passing brigade to output filters"; *err = "passing brigade to output filters";
break; break;
} }
mayflush = 1;
} }
apr_brigade_cleanup(ob); apr_brigade_cleanup(ob);
@ -821,6 +823,7 @@ recv_again:
*err = "passing brigade to output filters"; *err = "passing brigade to output filters";
break; break;
} }
mayflush = 1;
} }
apr_brigade_cleanup(ob); apr_brigade_cleanup(ob);
} }
@ -886,10 +889,11 @@ recv_again:
} }
} }
if ((conn->worker->s->flush_packets == flush_on) || if (((conn->worker->s->flush_packets == flush_on) ||
((conn->worker->s->flush_packets == flush_auto) && ((conn->worker->s->flush_packets == flush_auto) &&
(apr_poll(flushpoll, 1, &flushpoll_fd, (apr_poll(flushpoll, 1, &flushpoll_fd,
conn->worker->s->flush_wait) == APR_TIMEUP))) { conn->worker->s->flush_wait) == APR_TIMEUP))) && mayflush) {
mayflush = 0;
apr_bucket* flush_b = apr_bucket_flush_create(r->connection->bucket_alloc); apr_bucket* flush_b = apr_bucket_flush_create(r->connection->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(ob, flush_b); APR_BRIGADE_INSERT_TAIL(ob, flush_b);
rv = ap_pass_brigade(r->output_filters, ob); rv = ap_pass_brigade(r->output_filters, ob);