You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2016/02/11 14:53:07 UTC
svn commit: r1729830 - /httpd/httpd/trunk/modules/http2/mod_proxy_http2.c
Author: ylavic
Date: Thu Feb 11 13:53:07 2016
New Revision: 1729830
URL: http://svn.apache.org/viewvc?rev=1729830&view=rev
Log:
mod_proxy_http2: remove code working around issue fixed (hopefully) in 1729826.
Modified:
httpd/httpd/trunk/modules/http2/mod_proxy_http2.c
Modified: httpd/httpd/trunk/modules/http2/mod_proxy_http2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/mod_proxy_http2.c?rev=1729830&r1=1729829&r2=1729830&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/mod_proxy_http2.c (original)
+++ httpd/httpd/trunk/modules/http2/mod_proxy_http2.c Thu Feb 11 13:53:07 2016
@@ -220,7 +220,6 @@ static int proxy_http2_handler(request_r
conn_rec *c = r->connection;
apr_pool_t *p = r->pool;
apr_uri_t *uri = apr_palloc(p, sizeof(*uri));
- const char *ssl_hostname = NULL;
conn_rec *backconn;
/* find the scheme */
@@ -279,13 +278,6 @@ static int proxy_http2_handler(request_r
goto cleanup;
}
- if (!ssl_hostname && backend->ssl_hostname) {
- /* When reusing connections and finding sockets closed, the proxy
- * framework loses the ssl_hostname setting. This is vital for us,
- * so we save it once it is known. */
- ssl_hostname = apr_pstrdup(r->pool, backend->ssl_hostname);
- }
-
/* Step Two: Make the Connection (or check that an already existing
* socket is still usable). On success, we have a socket connected to
* backend->hostname. */
@@ -301,10 +293,9 @@ static int proxy_http2_handler(request_r
backconn = backend->connection;
if (!backconn) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r, APLOGNO()
- "setup new connection: is_ssl=%d %s %s %s, was %s",
+ "setup new connection: is_ssl=%d %s %s %s",
backend->is_ssl,
- backend->ssl_hostname, r->hostname, backend->hostname,
- ssl_hostname);
+ backend->ssl_hostname, r->hostname, backend->hostname);
if ((status = ap_proxy_connection_create(proxy_function, backend,
c, r->server)) != OK) {
goto cleanup;
@@ -316,9 +307,9 @@ static int proxy_http2_handler(request_r
* requested, such that mod_ssl can check if it is requested to do
* so.
*/
- if (ssl_hostname) {
+ if (backend->ssl_hostname) {
apr_table_setn(backend->connection->notes,
- "proxy-request-hostname", ssl_hostname);
+ "proxy-request-hostname", backend->ssl_hostname);
}
if (backend->is_ssl) {