mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
multi: remove data->state.current_conn struct field
Not needed
This commit is contained in:
parent
eb41e8eebe
commit
784336deec
@ -812,7 +812,7 @@ CURLcode curl_easy_pause(CURL *curl, int action)
|
|||||||
do {
|
do {
|
||||||
chunklen = (tempsize > CURL_MAX_WRITE_SIZE)?CURL_MAX_WRITE_SIZE:tempsize;
|
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);
|
temptype, tempwrite, chunklen);
|
||||||
if(result)
|
if(result)
|
||||||
/* failures abort the loop at once */
|
/* failures abort the loop at once */
|
||||||
|
@ -2605,7 +2605,7 @@ CURLcode Curl_disconnect(struct connectdata *conn, bool dead_connection)
|
|||||||
}
|
}
|
||||||
|
|
||||||
conn_free(conn);
|
conn_free(conn);
|
||||||
data->state.current_conn = NULL;
|
|
||||||
Curl_speedinit(data);
|
Curl_speedinit(data);
|
||||||
|
|
||||||
return CURLE_OK;
|
return CURLE_OK;
|
||||||
@ -5865,9 +5865,7 @@ CURLcode Curl_do_more(struct connectdata *conn, bool *completed)
|
|||||||
void Curl_reset_reqproto(struct connectdata *conn)
|
void Curl_reset_reqproto(struct connectdata *conn)
|
||||||
{
|
{
|
||||||
struct SessionHandle *data = conn->data;
|
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.proto.generic = NULL;
|
||||||
}
|
}
|
||||||
data->state.current_conn = conn;
|
|
||||||
}
|
|
||||||
|
@ -1295,8 +1295,6 @@ struct UrlState {
|
|||||||
struct POP3 *pop3;
|
struct POP3 *pop3;
|
||||||
struct SMTP *smtp;
|
struct SMTP *smtp;
|
||||||
} proto;
|
} proto;
|
||||||
/* current user of this SessionHandle instance, or NULL */
|
|
||||||
struct connectdata *current_conn;
|
|
||||||
|
|
||||||
/* if true, force SSL connection retry (workaround for certain servers) */
|
/* if true, force SSL connection retry (workaround for certain servers) */
|
||||||
bool ssl_connect_retry;
|
bool ssl_connect_retry;
|
||||||
|
Loading…
Reference in New Issue
Block a user