mod_proxy(es): Avoid error response/document handling by the core if some

input filter already did it while reading client's payload.

When an input filter returns AP_FILTER_ERROR, it has already called ap_die()
or at least already responded to the client.

Here we don't want to lose AP_FILTER_ERROR when returning from proxy handlers,
so we use ap_map_http_request_error() to forward any AP_FILTER_ERROR to
ap_die() which knows whether a response needs to be completed or not.

Before this commit, returning an HTTP error code in this case caused a double
response to be generated.

Depends on r1657881 to preserve r->status (for logging) when nothing is to be
done by ap_die() when handling AP_FILTER_ERROR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657897 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2015-02-06 16:54:16 +00:00
parent be12754eed
commit b26841b8dc
7 changed files with 56 additions and 26 deletions

View File

@ -431,8 +431,9 @@ static int pass_response(request_rec *r, proxy_conn_rec *conn)
}
}
/* XXX: What could we do with that return code? */
(void)ap_pass_brigade(r->output_filters, bb);
if (ap_pass_brigade(r->output_filters, bb)) {
return AP_FILTER_ERROR;
}
return OK;
}