Commit 6333e9f8 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Stop checking to see if this is a pipelined request if we know 

for a fact that it isn't.  Basically, if r->connection->keepalive == 0.
This keeps us from making an extra read call when serving a 1.0
request.
Submitted by:	  Ryan Bloom and Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87738 13f79535-47bb-0310-9956-ffa450edef68
parent 2ca370df

CHANGES

+5 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0b1



  *) Stop checking to see if this is a pipelined request if we know

     for a fact that it isn't.  Basically, if r->connection->keepalive == 0.

     This keeps us from making an extra read call when serving a 1.0

     request.  [Ryan Bloom and Greg Stein]



  *) Fix the handling of variable expansion look-ahead in mod_rewrite,

     i.e. syntax like %{LA-U:REMOTE_USER}, and also fix the parsing of

     more complicated nested RewriteMap lookups. PR#7087 [Tony Finch]

modules/http/http_request.c

+2 −1
Original line number Diff line number Diff line
@@ -1357,7 +1357,8 @@ static void process_request_internal(request_rec *r) 
static void check_pipeline_flush(request_rec *r)

{

    apr_bucket_brigade *bb = apr_brigade_create(r->pool);

    if (ap_get_brigade(r->input_filters, bb, AP_MODE_PEEK) != APR_SUCCESS) {

    if (!r->connection->keepalive || 

        ap_get_brigade(r->input_filters, bb, AP_MODE_PEEK) != APR_SUCCESS) {

        apr_bucket *e = apr_bucket_create_flush();



        /* We just send directly to the connection based filters, because at