diff options
| author | Yann Ylavic <ylavic@apache.org> | 2016-02-11 14:53:07 +0100 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2016-02-11 14:53:07 +0100 |
| commit | debe7befc8c7eca8e3103627607a8cdb2a2506ce (patch) | |
| tree | 674fde2d34f0925711f708ed20772697f57c53fa /modules/http2/mod_proxy_http2.c | |
| parent | mod_proxy: Play/restore the TLS-SNI on new backend connections which (diff) | |
| download | apache2-debe7befc8c7eca8e3103627607a8cdb2a2506ce.tar.xz apache2-debe7befc8c7eca8e3103627607a8cdb2a2506ce.zip | |
mod_proxy_http2: remove code working around issue fixed (hopefully) in 1729826.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729830 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http2/mod_proxy_http2.c')
| -rw-r--r-- | modules/http2/mod_proxy_http2.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/modules/http2/mod_proxy_http2.c b/modules/http2/mod_proxy_http2.c index eb48c3dfc7..0ab6dd07fc 100644 --- a/modules/http2/mod_proxy_http2.c +++ b/modules/http2/mod_proxy_http2.c @@ -220,7 +220,6 @@ static int proxy_http2_handler(request_rec *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_rec *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_rec *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_rec *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) { |