ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

prevent dig hang when nghttp2 callback fails

Browse Source 
calling recv_done() with ISC_R_CANCELED prevents dig from cleaning
up fully from the query, because when that result code is used
it means some resources are already gone. changing the result
to ISC_R_UNEXPECTED prevents the hang.
This commit is contained in:
Evan Hunt
2021-02-11 12:17:19 -08:00
parent f9ec55fd9a
commit d18a4d47f6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/isc/netmgr/http.c
View File

@@ -426,7 +426,7 @@ on_stream_close_callback(nghttp2_session *ngsession, int32_t stream_id,
rv = nghttp2_session_terminate_session(
ngsession, NGHTTP2_NO_ERROR);
if (rv != 0) {
return (NGHTTP2_ERR_CALLBACK_FAILURE);
return (rv);
}
if (session->handle->sock->h2.session->reading)
{
@@ -447,7 +447,7 @@ on_stream_close_callback(nghttp2_session *ngsession, int32_t stream_id,
}
isc__nmsocket_prep_destroy(sock);
if (rv != 0) {
return (NGHTTP2_ERR_CALLBACK_FAILURE);
return (rv);
}
}
@@ -523,7 +523,7 @@ client_on_header_callback(nghttp2_session *ngsession,
client_handle_content_type_header(cstream, value,
valuelen);
if (!cstream->response_status.content_type_valid) {
return (NGHTTP2_ERR_CALLBACK_FAILURE);
return (NGHTTP2_ERR_HTTP_HEADER);
}
}
break;
@@ -705,7 +705,7 @@ http_readcb(isc_nmhandle_t *handle, isc_result_t result, isc_region_t *region,
readlen = nghttp2_session_mem_recv(session->ngsession, region->base,
region->length);
if (readlen < 0) {
failed_read_cb(ISC_R_CANCELED, session);
failed_read_cb(ISC_R_UNEXPECTED, session);
return;
}