moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

multi: remove data->state.current_conn struct field 

Not needed
This commit is contained in:
Daniel Stenberg 2013-08-03 00:03:52 +02:00
parent eb41e8eebe
commit 784336deec
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/easy.c
View File

@ -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 */

10
lib/url.c
View File

@ -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);
data->state.proto.generic = NULL;
}
data->state.current_conn = conn;
Curl_safefree(data->state.proto.generic);
data->state.proto.generic = NULL;
}

2
lib/urldata.h
View File

@ -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;