From b031a1ffed23ddc5519853318a9751db0d823137 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Mon, 27 Jun 2016 21:49:15 +0000 Subject: [PATCH] mod_proxy: we don't need ap_proxy_ssl_connection_cleanup() anymore with ap_proxy_check_backend() used at connection reuse time, so remove its last call and deprecate it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750416 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy.h | 1 + modules/proxy/mod_proxy_http.c | 5 ----- modules/proxy/proxy_util.c | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index 21043e401a..f606b18ed4 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -668,6 +668,7 @@ PROXY_DECLARE(int) ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *c PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r); /* DEPRECATED (will be replaced with ap_proxy_connect_backend */ PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **, const char *, apr_sockaddr_t *, const char *, proxy_server_conf *, request_rec *); +/* DEPRECATED (will be replaced with ap_proxy_check_backend */ PROXY_DECLARE(apr_status_t) ap_proxy_ssl_connection_cleanup(proxy_conn_rec *conn, request_rec *r); PROXY_DECLARE(int) ap_proxy_ssl_enable(conn_rec *c); diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c index de86636a62..a0d88eb050 100644 --- a/modules/proxy/mod_proxy_http.c +++ b/modules/proxy/mod_proxy_http.c @@ -1994,13 +1994,8 @@ static int proxy_http_handler(request_rec *r, proxy_worker *worker, worker, r->server)) != OK) goto cleanup; - backend->is_ssl = is_ssl; - if (is_ssl) { - ap_proxy_ssl_connection_cleanup(backend, r); - } - /* * In the case that we are handling a reverse proxy connection and this * is not a request that is coming over an already kept alive connection diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 4a02eb00d3..1e00d8ab1a 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -1399,6 +1399,7 @@ static apr_status_t connection_cleanup(void *theconn) return APR_SUCCESS; } +/* DEPRECATED */ PROXY_DECLARE(apr_status_t) ap_proxy_ssl_connection_cleanup(proxy_conn_rec *conn, request_rec *r) { -- 2.50.1