Commit 1259ccf7 authored by Steve Holme's avatar Steve Holme Committed by Daniel Stenberg
Browse files

ConnectionExists: Fix reuse for TLS upgraded connections 

Fixed the connection reuse detection in ConnectionExists() when
comparing a new connection that is non-SSL based against that of a SSL
based connection that has become so by being upgraded via TLS.
parent 07e3b751

lib/url.c

+11 −7
Original line number Diff line number Diff line
@@ -2961,6 +2961,8 @@ ConnectionExists(struct SessionHandle *data, 
    if((needle->handler->flags&PROTOPT_SSL) !=

       (check->handler->flags&PROTOPT_SSL))

      /* don't do mixed SSL and non-SSL connections */

      if(!(needle->handler->protocol & check->handler->protocol))

        /* except protocols that have been upgraded via TLS */

        continue;



    if(needle->handler->flags&PROTOPT_SSL) {
@@ -3005,14 +3007,16 @@ ConnectionExists(struct SessionHandle *data, 
        (needle->port == check->port))) {

      /* The requested connection does not use a HTTP proxy or it uses SSL or

         it is a non-SSL protocol tunneled over the same http proxy name and

         port number */

         port number or it is a non-SSL protocol which is allowed to be

         upgraded via TLS */



      if(Curl_raw_equal(needle->handler->scheme, check->handler->scheme) &&

      if((Curl_raw_equal(needle->handler->scheme, check->handler->scheme) ||

          needle->handler->protocol & check->handler->protocol) &&

         Curl_raw_equal(needle->host.name, check->host.name) &&

         (needle->remote_port == check->remote_port) ) {

         needle->remote_port == check->remote_port) {

        if(needle->handler->flags & PROTOPT_SSL) {

          /* This is SSL, verify that we're using the same

             ssl options as well */

          /* This is a SSL connection so verify that we're using the same

             SSL options as well */

          if(!Curl_ssl_config_matches(&needle->ssl_config,

                                      &check->ssl_config)) {

            DEBUGF(infof(data,
@@ -3023,7 +3027,7 @@ ConnectionExists(struct SessionHandle *data, 
          }

          else if(check->ssl[FIRSTSOCKET].state != ssl_connection_complete) {

            DEBUGF(infof(data,

                         "Connection #%ld has not started ssl connect, "

                         "Connection #%ld has not started SSL connect, "

                         "can't reuse\n",

                         check->connectindex));

            continue;