1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

mod_proxy_http: follow up to r1656259.

The proxy connection may be NULL during prefetch, don't try to dereference it!
Still origin->keepalive will be set according to p_conn->close by the caller
(proxy_http_handler).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678771 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2015-05-11 15:48:58 +00:00
parent ff720d0f56
commit 8c162db8b6

View File

@@ -747,7 +747,6 @@ static int ap_proxy_http_prefetch(apr_pool_t *p, request_rec *r,
apr_off_t bytes;
int force10, rv;
apr_read_type_e block;
conn_rec *origin = p_conn->connection;
if (apr_table_get(r->subprocess_env, "force-proxy-request-1.0")) {
if (r->expecting_100) {
@@ -805,7 +804,6 @@ static int ap_proxy_http_prefetch(apr_pool_t *p, request_rec *r,
"chunked body with Content-Length (C-L ignored)",
c->client_ip, c->remote_host ? c->remote_host: "");
*old_cl_val = NULL;
origin->keepalive = AP_CONN_CLOSE;
p_conn->close = 1;
}