mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-01-21 01:13:43 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix error handling in async resolver

Browse Source 
PUBLISHED_FROM=1e8558ec08f8e72d70163d34e0920f80f74372d1
This commit is contained in:
Deomid Ryabkov 2015-11-17 08:48:35 +00:00 committed by Sergey Lyubka
parent 6418cad39f
commit 5cdf838325
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mongoose.c
View File

@ -7796,8 +7796,6 @@ static void mg_resolve_async_eh(struct mg_connection *nc, int ev, void *data) {
case MG_EV_CONNECT:
case MG_EV_POLL:
if (req->retries > req->max_retries) {
req->callback(NULL, req->data);
MG_FREE(req);
nc->flags |= MG_F_CLOSE_IMMEDIATELY;
break;
}
@ -7812,13 +7810,28 @@ static void mg_resolve_async_eh(struct mg_connection *nc, int ev, void *data) {
if (mg_parse_dns(nc->recv_mbuf.buf, *(int *) data, msg) == 0 &&
msg->num_answers > 0) {
req->callback(msg, req->data);
} else {
req->callback(NULL, req->data);
nc->user_data = NULL;
MG_FREE(req);
}
MG_FREE(req);
MG_FREE(msg);
nc->flags |= MG_F_CLOSE_IMMEDIATELY;
break;
case MG_EV_SEND:
/*
* If a send error occurs, prevent closing of the connection by the core.
* We will retry after timeout.
*/
nc->flags &= ~MG_F_CLOSE_IMMEDIATELY;
mbuf_remove(&nc->send_mbuf, nc->send_mbuf.len);
break;
case MG_EV_CLOSE:
/* If we got here with request still not done, fire an error callback. */
if (req != NULL) {
req->callback(NULL, req->data);
nc->user_data = NULL;
MG_FREE(req);
}
break;
}
}