52c52 < static void nxt_fastcgi_source_record_filter(nxt_thread_t *thr, void *obj, --- > static void nxt_fastcgi_source_record_filter(nxt_task_t *task, void *obj, 54c54 < static void nxt_fastcgi_source_record_error(nxt_thread_t *thr, void *obj, --- > static void nxt_fastcgi_source_record_error(nxt_task_t *task, void *obj, 56c56 < static void nxt_fastcgi_source_header_filter(nxt_thread_t *thr, void *obj, --- > static void nxt_fastcgi_source_header_filter(nxt_task_t *task, void *obj, 58c58 < static void nxt_fastcgi_source_sync_buffer(nxt_thread_t *thr, --- > static void nxt_fastcgi_source_sync_buffer(nxt_task_t *task, 61c61,62 < static nxt_int_t nxt_fastcgi_source_header_process(nxt_fastcgi_source_t *fs); --- > static nxt_int_t nxt_fastcgi_source_header_process(nxt_task_t *task, > nxt_fastcgi_source_t *fs); 69c70 < static void nxt_fastcgi_source_body_filter(nxt_thread_t *thr, void *obj, --- > static void nxt_fastcgi_source_body_filter(nxt_task_t *task, void *obj, 72,73c73,75 < static void nxt_fastcgi_source_error(nxt_stream_source_t *stream); < static void nxt_fastcgi_source_fail(nxt_fastcgi_source_t *fs); --- > static void nxt_fastcgi_source_error(nxt_task_t *task, > nxt_stream_source_t *stream); > static void nxt_fastcgi_source_fail(nxt_task_t *task, nxt_fastcgi_source_t *fs); 120c122 < nxt_fastcgi_source_handler(nxt_upstream_source_t *us, --- > nxt_fastcgi_source_handler(nxt_task_t *task, nxt_upstream_source_t *us, 184c186 < nxt_stream_source_connect(stream); --- > nxt_stream_source_connect(task, stream); 190c192 < nxt_fastcgi_source_fail(fs); --- > nxt_fastcgi_source_fail(task, fs); 386c388 < nxt_fastcgi_source_record_filter(nxt_thread_t *thr, void *obj, void *data) --- > nxt_fastcgi_source_record_filter(nxt_task_t *task, void *obj, void *data) 397c399 < nxt_log_debug(thr->log, "fastcgi source record filter"); --- > nxt_debug(task, "fastcgi source record filter"); 403c405 < nxt_fastcgi_record_parse(&fsr->parse, in); --- > nxt_fastcgi_record_parse(task, &fsr->parse, in); 408c410 < nxt_fastcgi_source_fail(fs); --- > nxt_fastcgi_source_fail(task, fs); 416,417c418,420 < nxt_thread_current_work_queue_add(thr, nxt_fastcgi_source_record_error, < fs, NULL, thr->log); --- > nxt_thread_current_work_queue_add(task->thread, > nxt_fastcgi_source_record_error, > task, fs, NULL); 433,435c436,438 < nxt_log_error(NXT_LOG_ERR, thr->log, < "upstream sent in FastCGI stderr: \"%*s\"", < size, b->mem.pos); --- > nxt_log(task, NXT_LOG_ERR, > "upstream sent in FastCGI stderr: \"%*s\"", > size, b->mem.pos); 438c441 < b->completion_handler(thr, b, b->parent); --- > b->completion_handler(task, b, b->parent); 444,445c447,448 < nxt_source_filter(thr, fs->upstream->work_queue, &fsr->next, < fsr->parse.out[0]); --- > nxt_source_filter(task->thread, fs->upstream->work_queue, task, > &fsr->next, fsr->parse.out[0]); 451c454 < nxt_fastcgi_source_record_error(nxt_thread_t *thr, void *obj, void *data) --- > nxt_fastcgi_source_record_error(nxt_task_t *task, void *obj, void *data) 457c460 < nxt_fastcgi_source_fail(fs); --- > nxt_fastcgi_source_fail(task, fs); 462c465 < nxt_fastcgi_source_header_filter(nxt_thread_t *thr, void *obj, void *data) --- > nxt_fastcgi_source_header_filter(nxt_task_t *task, void *obj, void *data) 472c475 < nxt_log_debug(thr->log, "fastcgi source header filter"); --- > nxt_debug(task, "fastcgi source header filter"); 475c478 < nxt_fastcgi_source_sync_buffer(thr, fs, b); --- > nxt_fastcgi_source_sync_buffer(task, fs, b); 486c489 < ret = nxt_fastcgi_source_header_process(fs); --- > ret = nxt_fastcgi_source_header_process(task, fs); 494c497 < nxt_log_debug(thr->log, "fastcgi source header done"); --- > nxt_debug(task, "fastcgi source header done"); 503,507c506,510 < nxt_log_error(NXT_LOG_ERR, thr->log, < "upstream sent invalid header line: \"%*s\\r...\"", < fs->u.header.parse.header_end < - fs->u.header.parse.header_name_start, < fs->u.header.parse.header_name_start); --- > nxt_log(task, NXT_LOG_ERR, > "upstream sent invalid header line: \"%*s\\r...\"", > fs->u.header.parse.header_end > - fs->u.header.parse.header_name_start, > fs->u.header.parse.header_name_start); 512c515 < nxt_fastcgi_source_fail(fs); --- > nxt_fastcgi_source_fail(task, fs); 523c526 < nxt_fastcgi_source_sync_buffer(nxt_thread_t *thr, nxt_fastcgi_source_t *fs, --- > nxt_fastcgi_source_sync_buffer(nxt_task_t *task, nxt_fastcgi_source_t *fs, 527,528c530 < nxt_log_error(NXT_LOG_ERR, thr->log, < "upstream closed prematurely connection"); --- > nxt_log(task, NXT_LOG_ERR, "upstream closed prematurely connection"); 531,534c533,535 < nxt_log_error(NXT_LOG_ERR, thr->log, "%ui buffers %uz each are not " < "enough to process upstream response header", < fs->upstream->buffers.max, < fs->upstream->buffers.size); --- > nxt_log(task, NXT_LOG_ERR, "%ui buffers %uz each are not " > "enough to process upstream response header", > fs->upstream->buffers.max, fs->upstream->buffers.size); 539c540 < nxt_fastcgi_source_fail(fs); --- > nxt_fastcgi_source_fail(task, fs); 544c545 < nxt_fastcgi_source_header_process(nxt_fastcgi_source_t *fs) --- > nxt_fastcgi_source_header_process(nxt_task_t *task, nxt_fastcgi_source_t *fs) 547d547 < nxt_thread_t *thr; 553d552 < thr = nxt_thread(); 559,561c558,560 < nxt_log_error(NXT_LOG_INFO, thr->log, < "upstream sent too long header field name: \"%*s\"", < len, hp->header_name_start); --- > nxt_log(task, NXT_LOG_INFO, > "upstream sent too long header field name: \"%*s\"", > len, hp->header_name_start); 577,578c576,577 < nxt_log_debug(thr->log, "http header: \"%*s: %*s\"", < nv->name_len, nv->name_start, nv->value_len, nv->value_start); --- > nxt_debug(task, "http header: \"%*s: %*s\"", > nv->name_len, nv->name_start, nv->value_len, nv->value_start); 685c684 < nxt_fastcgi_source_body_filter(nxt_thread_t *thr, void *obj, void *data) --- > nxt_fastcgi_source_body_filter(nxt_task_t *task, void *obj, void *data) 693c692 < nxt_log_debug(thr->log, "fastcgi source body filter"); --- > nxt_debug(task, "fastcgi source body filter"); 704c703,704 < nxt_source_filter(thr, fs->upstream->work_queue, fs->next, in); --- > nxt_source_filter(task->thread, fs->upstream->work_queue, task, > fs->next, in); 732c732 < nxt_fastcgi_source_error(nxt_stream_source_t *stream) --- > nxt_fastcgi_source_error(nxt_task_t *task, nxt_stream_source_t *stream) 740c740 < nxt_fastcgi_source_fail(fs); --- > nxt_fastcgi_source_fail(task, fs); 745c745 < nxt_fastcgi_source_fail(nxt_fastcgi_source_t *fs) --- > nxt_fastcgi_source_fail(nxt_task_t *task, nxt_fastcgi_source_t *fs) 747c747 < nxt_thread_t *thr; --- > nxt_debug(task, "fastcgi source fail"); 749,752d748 < thr = nxt_thread(); < < nxt_log_debug(thr->log, "fastcgi source fail"); < 755c751 < fs->upstream->state->error_handler(thr, fs, NULL); --- > fs->upstream->state->error_handler(task, fs, NULL);