Commit c2479ccb authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

my proxytunnel fix accidentally ruined the normal https connects

parent fc07eb45

lib/http.c

+7 −7
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ CURLcode Curl_http_connect(struct connectdata *conn) 
                                         conn->hostname, conn->remote_port);

    if(CURLE_OK != result)

      return result;

  }    



  if(conn->protocol & PROT_HTTPS) {

    /* now, perform the SSL initialization for this socket */
@@ -414,7 +415,6 @@ CURLcode Curl_http_connect(struct connectdata *conn) 
    if(result)

      return result;

  }

  }



  if(conn->bits.user_passwd && !data->state.this_is_a_follow) {

    /* Authorization: is requested, this is not a followed location, get the