From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 4 Nov 2010 14:16:27 +0000 (+0100)
Subject: SNI: simplify the custom host name use
X-Git-Tag: curl-7_21_3~106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b2fbe1e97891f;p=curl

SNI: simplify the custom host name use

The redirect check is already done at the position where the customhost
field is assigned so there's no point in doing that a second time.
---

diff --git a/lib/ssluse.c b/lib/ssluse.c
index 01e688c7d..b3a05f907 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -1642,12 +1642,8 @@ ossl_connect_step1(struct connectdata *conn,
   connssl->server_cert = 0x0;
 
 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-  if((!data->state.this_is_a_follow ||
-      Curl_raw_equal(data->state.first_host, conn->host.name)) &&
-     conn->allocptr.customhost)
-    hostname = conn->allocptr.customhost;
-  else
-    hostname = conn->host.name;
+  hostname = conn->allocptr.customhost?conn->allocptr.customhost:
+    conn->host.name;
 
   if ((0 == Curl_inet_pton(AF_INET, hostname, &addr)) &&
 #ifdef ENABLE_IPV6