moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-12 04:25:08 -05:00
Code Issues Releases Wiki Activity

multi.c: OOM handling fix

Browse Source
This commit is contained in:
Yang Tse 2011-11-01 14:38:21 +01:00
parent af425efe83
commit f7dfe2b87a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/multi.c
View File

@ -514,6 +514,9 @@ CURLMcode curl_multi_add_handle(CURLM *multi_handle,
prev->next = next; prev->next = next;
else else
multi->closure = next; multi->closure = next;
/* removed from closure list now, this might reuse an existing
existing connection but we don't know that at this point */
data->state.shared_conn = NULL;
/* No need to continue, handle can only be present once in the list */ /* No need to continue, handle can only be present once in the list */
break; break;
} }
@ -1788,7 +1791,7 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
able to close connections "properly" */ able to close connections "properly" */
cl = multi->closure; cl = multi->closure;
while(cl) { while(cl) {
cl->easy_handle->state.shared_conn = NULL; /* no more shared */ cl->easy_handle->state.shared_conn = NULL; /* allow cleanup */
if(cl->easy_handle->state.closed) if(cl->easy_handle->state.closed)
/* close handle only if curl_easy_cleanup() already has been called /* close handle only if curl_easy_cleanup() already has been called
for this easy handle */ for this easy handle */
@ -2708,14 +2711,17 @@ static void multi_connc_remove_handle(struct Curl_multi *multi,
/* out of memory - so much for graceful shutdown */ /* out of memory - so much for graceful shutdown */
Curl_disconnect(conn, /* dead_connection */ FALSE); Curl_disconnect(conn, /* dead_connection */ FALSE);
multi->connc->connects[i] = NULL; multi->connc->connects[i] = NULL;
data->state.shared_conn = NULL;
} }
} }
else else {
/* disconect the easy handle from the connection since the connection /* disconect the easy handle from the connection since the connection
will now remain but this easy handle is going */ will now remain but this easy handle is going */
data->state.shared_conn = NULL;
conn->data = NULL; conn->data = NULL;
} }
} }
}
} }
/* Add the given data pointer to the list of 'closure handles' that are kept /* Add the given data pointer to the list of 'closure handles' that are kept