Commit 9f8ed6df authored by Luca Toscano's avatar Luca Toscano
Browse files

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

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
parent 676df337

modules/proxy/mod_proxy_fcgi.c

+8 −4
Original line number Diff line number Diff line
@@ -667,6 +667,7 @@ static apr_status_t dispatch(proxy_conn_rec *conn, proxy_dir_conf *conf, 
            apr_bucket *b;

            unsigned char plen;

            unsigned char type, version;

            int mayflush = 0;



            /* First, we grab the header... */

            rv = get_data_full(conn, (char *) farray, AP_FCGI_HEADER_LEN);
@@ -795,6 +796,7 @@ recv_again: 
                                    *err = "passing brigade to output filters";

                                    break;

                                }

                                mayflush = 1;

                            }

                            apr_brigade_cleanup(ob);
@@ -821,6 +823,7 @@ recv_again: 
                                *err = "passing brigade to output filters";

                                break;

                            }

                            mayflush = 1;

                        }

                        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) && 

                  (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_BRIGADE_INSERT_TAIL(ob, flush_b);

                rv = ap_pass_brigade(r->output_filters, ob);