Commit d5dcbc92 authored by Eric Covener's avatar Eric Covener
Browse files

Merge r1634120 from trunk: 

* Use the correct server name for SNI in case the backend SSL connection itself
  is established via a proxy server.

PR: 57139
Submitted by: Szabolcs Gyurko <szabolcs gyurko.org>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1673941 13f79535-47bb-0310-9956-ffa450edef68
parent df83a40a

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ Changes with Apache 2.4.13 
     calls r:wsupgrade() can cause a child process crash. 

     [Edward Lu <Chaosed0 gmail.com>]



  *) mod_proxy: Use the correct server name for SNI in case the backend

     SSL connection itself is established via a proxy server.

     PR 57139 [Szabolcs Gyurko <szabolcs gyurko.org>]



  *) mod_ssl: Fix possible crash when loading server certificate constraints.

     PR 57694. [Paul Spangler <paul.spangler ni com>, Yann Ylavic]

STATUS

+0 −6
Changes for STATUS: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -105,12 +105,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_proxy: Use the correct server name for SNI in case the backend

     SSL connection itself is established via a proxy server.  PR 57139

     trunk patch: http://svn.apache.org/r1634120

     2.4.x patch: trunk works (modulo CHANGES)

     +1: ylavic, rjung, covener



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/proxy/proxy_util.c

+4 −0
Changes for modules/proxy/proxy_util.c: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2384,6 +2384,10 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r, 
        if (dconf->preserve_host) {

            ssl_hostname = r->hostname;

        }

        else if (conn->forward

                 && ((forward_info *)(conn->forward))->use_http_connect) {

            ssl_hostname = ((forward_info *)conn->forward)->target_host;

        }

        else {

            ssl_hostname = conn->hostname;

        }