Commit 784336de authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

multi: remove data->state.current_conn struct field 

Not needed
parent eb41e8ee

lib/easy.c

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ CURLcode curl_easy_pause(CURL *curl, int action) 
    do {

      chunklen = (tempsize > CURL_MAX_WRITE_SIZE)?CURL_MAX_WRITE_SIZE:tempsize;



      result = Curl_client_write(data->state.current_conn,

      result = Curl_client_write(data->easy_conn,

                                 temptype, tempwrite, chunklen);

      if(result)

        /* failures abort the loop at once */

lib/url.c

+4 −6
Original line number Diff line number Diff line
@@ -2605,7 +2605,7 @@ CURLcode Curl_disconnect(struct connectdata *conn, bool dead_connection) 
  }



  conn_free(conn);

  data->state.current_conn = NULL;



  Curl_speedinit(data);



  return CURLE_OK;
@@ -5865,9 +5865,7 @@ CURLcode Curl_do_more(struct connectdata *conn, bool *completed) 
void Curl_reset_reqproto(struct connectdata *conn)

{

  struct SessionHandle *data = conn->data;

  if(data->state.proto.generic && data->state.current_conn != conn) {

    free(data->state.proto.generic);



  Curl_safefree(data->state.proto.generic);

  data->state.proto.generic = NULL;

}
 
  data->state.current_conn = conn;

}

lib/urldata.h

+0 −2
Original line number Diff line number Diff line
@@ -1295,8 +1295,6 @@ struct UrlState { 
    struct POP3 *pop3;

    struct SMTP *smtp;

  } proto;

  /* current user of this SessionHandle instance, or NULL */

  struct connectdata *current_conn;



  /* if true, force SSL connection retry (workaround for certain servers) */

  bool ssl_connect_retry;