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

fixup! start refactoring isc_nm_httprequest() into read/send

Browse Source
This commit is contained in:
Artem Boldariev
2021-02-08 20:59:44 +02:00
parent 697192d5cd
commit 01fce69199
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1554,9 +1554,8 @@ isc__nm_async_httpsend(isc__networker_t *worker, isc__netievent_t *ev0) {
session = sock->h2.session;
if (session != NULL && session->client) {
result = client_send(
handle,
&(isc_region_t){ (uint8_t *)req->uvbuf.base,
req->uvbuf.len });
handle, &(isc_region_t){ (uint8_t *)req->uvbuf.base,
req->uvbuf.len });
if (result != ISC_R_SUCCESS) {
failed_send_cb(sock, req, result);
return;
@@ -1589,8 +1588,8 @@ isc__nm_async_httpsend(isc__networker_t *worker, isc__netievent_t *ev0) {
};
result = server_send_response(handle->httpsession->ngsession,
sock->h2.stream_id, hdrs,
sizeof(hdrs) / sizeof(nghttp2_nv), sock);
sock->h2.stream_id, hdrs,
sizeof(hdrs) / sizeof(nghttp2_nv), sock);
http_do_bio(handle->httpsession);
cb(handle, result, cbarg);
@@ -2211,10 +2210,9 @@ void
isc__nm_http_initsocket(isc_nmsocket_t *sock) {
REQUIRE(sock != NULL);
sock->h2 = (isc_nmsocket_h2_t){
.request_type = ISC_HTTP_REQ_UNSUPPORTED,
.request_scheme = ISC_HTTP_SCHEME_UNSUPPORTED,
};
memset(&sock->h2, 0, sizeof(sock->h2));
sock->h2.request_type = ISC_HTTP_REQ_UNSUPPORTED;
sock->h2.request_scheme = ISC_HTTP_SCHEME_UNSUPPORTED;
if (sock->type == isc_nm_httplistener) {
ISC_LIST_INIT(sock->h2.handlers);