18c18 < static void nxt_http_source_status_filter(nxt_thread_t *thr, void *obj, --- > static void nxt_http_source_status_filter(nxt_task_t *task, void *obj, 20c20 < static void nxt_http_source_header_filter(nxt_thread_t *thr, void *obj, --- > static void nxt_http_source_header_filter(nxt_task_t *task, void *obj, 29,31c29,31 < static void nxt_http_source_header_ready(nxt_http_source_t *hs, < nxt_buf_t *rest); < static void nxt_http_source_chunk_filter(nxt_thread_t *thr, void *obj, --- > static void nxt_http_source_header_ready(nxt_task_t *task, > nxt_http_source_t *hs, nxt_buf_t *rest); > static void nxt_http_source_chunk_filter(nxt_task_t *task, void *obj, 33c33 < static void nxt_http_source_chunk_error(nxt_thread_t *thr, void *obj, --- > static void nxt_http_source_chunk_error(nxt_task_t *task, void *obj, 35c35 < static void nxt_http_source_body_filter(nxt_thread_t *thr, void *obj, --- > static void nxt_http_source_body_filter(nxt_task_t *task, void *obj, 38,41c38,42 < static void nxt_http_source_sync_buffer(nxt_thread_t *thr, < nxt_http_source_t *hs, nxt_buf_t *b); < static void nxt_http_source_error(nxt_stream_source_t *stream); < static void nxt_http_source_fail(nxt_http_source_t *hs); --- > static void nxt_http_source_sync_buffer(nxt_task_t *task, nxt_http_source_t *hs, > nxt_buf_t *b); > static void nxt_http_source_error(nxt_task_t *task, > nxt_stream_source_t *stream); > static void nxt_http_source_fail(nxt_task_t *task, nxt_http_source_t *hs); 46c47 < nxt_http_source_handler(nxt_upstream_source_t *us, --- > nxt_http_source_handler(nxt_task_t *task, nxt_upstream_source_t *us, 102c103 < nxt_stream_source_connect(stream); --- > nxt_stream_source_connect(task, stream); 108c109 < nxt_http_source_fail(hs); --- > nxt_http_source_fail(task, hs); 187c188 < nxt_http_source_status_filter(nxt_thread_t *thr, void *obj, void *data) --- > nxt_http_source_status_filter(nxt_task_t *task, void *obj, void *data) 201c202 < nxt_log_debug(thr->log, "http source status filter"); --- > nxt_debug(task, "http source status filter"); 204c205 < nxt_http_source_sync_buffer(thr, hs, b); --- > nxt_http_source_sync_buffer(task, hs, b); 217,218c218,219 < nxt_log_debug(thr->log, "upstream status: \"%*s\"", < hs->u.status_parse.end - b->mem.start, b->mem.start); --- > nxt_debug(task, "upstream status: \"%*s\"", > hs->u.status_parse.end - b->mem.start, b->mem.start); 222,226c223,227 < nxt_log_debug(thr->log, "upstream version:%d status:%uD \"%*s\"", < hs->u.status_parse.http_version, < hs->u.status_parse.code, < hs->u.status_parse.end - hs->u.status_parse.start, < hs->u.status_parse.start); --- > nxt_debug(task, "upstream version:%d status:%uD \"%*s\"", > hs->u.status_parse.http_version, > hs->u.status_parse.code, > hs->u.status_parse.end - hs->u.status_parse.start, > hs->u.status_parse.start); 231c232 < nxt_http_source_header_filter(thr, hs, b); --- > nxt_http_source_header_filter(task, hs, b); 238c239 < nxt_http_source_header_ready(hs, b); --- > nxt_http_source_header_ready(task, hs, b); 254c255 < nxt_http_source_fail(hs); --- > nxt_http_source_fail(task, hs); 260c261 < nxt_http_source_header_filter(nxt_thread_t *thr, void *obj, void *data) --- > nxt_http_source_header_filter(nxt_task_t *task, void *obj, void *data) 274c275 < nxt_log_debug(thr->log, "http source header filter"); --- > nxt_debug(task, "http source header filter"); 277c278 < nxt_http_source_sync_buffer(thr, hs, b); --- > nxt_http_source_sync_buffer(task, hs, b); 296,297c297,298 < nxt_log_debug(thr->log, "http source header done"); < nxt_http_source_header_ready(hs, b); --- > nxt_debug(task, "http source header done"); > nxt_http_source_header_ready(task, hs, b); 307,311c308,312 < nxt_log_error(NXT_LOG_ERR, thr->log, < "upstream sent invalid header line: \"%*s\\r...\"", < hs->u.header.parse.header_end < - hs->u.header.parse.header_name_start, < hs->u.header.parse.header_name_start); --- > nxt_log(task, NXT_LOG_ERR, > "upstream sent invalid header line: \"%*s\\r...\"", > hs->u.header.parse.header_end > - hs->u.header.parse.header_name_start, > hs->u.header.parse.header_name_start); 316c317 < nxt_http_source_fail(hs); --- > nxt_http_source_fail(task, hs); 428c429,430 < nxt_http_source_header_ready(nxt_http_source_t *hs, nxt_buf_t *rest) --- > nxt_http_source_header_ready(nxt_task_t *task, nxt_http_source_t *hs, > nxt_buf_t *rest) 464c466 < hs->rest = nxt_http_chunk_parse(&hsc->parse, rest); --- > hs->rest = nxt_http_chunk_parse(task, &hsc->parse, rest); 492c494 < nxt_http_source_fail(hs); --- > nxt_http_source_fail(task, hs); 497c499 < nxt_http_source_chunk_filter(nxt_thread_t *thr, void *obj, void *data) --- > nxt_http_source_chunk_filter(nxt_task_t *task, void *obj, void *data) 506c508 < nxt_log_debug(thr->log, "http source chunk filter"); --- > nxt_debug(task, "http source chunk filter"); 508c510 < b = nxt_http_chunk_parse(&hsc->parse, b); --- > b = nxt_http_chunk_parse(task, &hsc->parse, b); 513c515 < nxt_http_source_fail(hs); --- > nxt_http_source_fail(task, hs); 519,520c521,523 < nxt_thread_current_work_queue_add(thr, nxt_http_source_chunk_error, < hs, NULL, thr->log); --- > nxt_thread_current_work_queue_add(task->thread, > nxt_http_source_chunk_error, > task, hs, NULL); 524c527,528 < nxt_source_filter(thr, hs->upstream->work_queue, &hsc->next, b); --- > nxt_source_filter(task->thread, hs->upstream->work_queue, task, > &hsc->next, b); 530c534 < nxt_http_source_chunk_error(nxt_thread_t *thr, void *obj, void *data) --- > nxt_http_source_chunk_error(nxt_task_t *task, void *obj, void *data) 536c540 < nxt_http_source_fail(hs); --- > nxt_http_source_fail(task, hs); 546c550 < nxt_http_source_body_filter(nxt_thread_t *thr, void *obj, void *data) --- > nxt_http_source_body_filter(nxt_task_t *task, void *obj, void *data) 554c558 < nxt_log_debug(thr->log, "http source body filter"); --- > nxt_debug(task, "http source body filter"); 565c569,570 < nxt_source_filter(thr, hs->upstream->work_queue, hs->next, in); --- > nxt_source_filter(task->thread, hs->upstream->work_queue, task, > hs->next, in); 574c579 < nxt_http_source_sync_buffer(nxt_thread_t *thr, nxt_http_source_t *hs, --- > nxt_http_source_sync_buffer(nxt_task_t *task, nxt_http_source_t *hs, 578,579c583,584 < nxt_log_error(NXT_LOG_ERR, thr->log, < "upstream closed prematurely connection"); --- > nxt_log(task, NXT_LOG_ERR, > "upstream closed prematurely connection"); 582,585c587,589 < nxt_log_error(NXT_LOG_ERR, thr->log, "%ui buffers %uz each are not " < "enough to process upstream response header", < hs->upstream->buffers.max, < hs->upstream->buffers.size); --- > nxt_log(task, NXT_LOG_ERR,"%ui buffers %uz each are not " > "enough to process upstream response header", > hs->upstream->buffers.max, hs->upstream->buffers.size); 590c594 < nxt_http_source_fail(hs); --- > nxt_http_source_fail(task, hs); 595c599 < nxt_http_source_error(nxt_stream_source_t *stream) --- > nxt_http_source_error(nxt_task_t *task, nxt_stream_source_t *stream) 602c606 < nxt_http_source_fail(hs); --- > nxt_http_source_fail(task, hs); 607c611 < nxt_http_source_fail(nxt_http_source_t *hs) --- > nxt_http_source_fail(nxt_task_t *task, nxt_http_source_t *hs) 609c613 < nxt_thread_t *thr; --- > nxt_debug(task, "http source fail"); 611,614d614 < thr = nxt_thread(); < < nxt_log_debug(thr->log, "http source fail"); < 617c617 < hs->upstream->state->error_handler(thr, hs, NULL); --- > hs->upstream->state->error_handler(task, hs, NULL);