httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1678771 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Date Mon, 11 May 2015 15:48:58 GMT
Author: ylavic
Date: Mon May 11 15:48:58 2015
New Revision: 1678771

URL: http://svn.apache.org/r1678771
Log:
mod_proxy_http: follow up to r1656259.
The proxy connection is NULL during prefetch, don't try to dereference it!

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_http.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=1678771&r1=1678770&r2=1678771&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Mon May 11 15:48:58 2015
@@ -747,7 +747,6 @@ static int ap_proxy_http_prefetch(apr_po
     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_po
                       "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;
     }
 



Mime
View raw message