Deleted
Added
nxt_event_conn_job_sendfile.c (771:f349b2d68e75) | nxt_event_conn_job_sendfile.c (979:7037bef7b9b0) |
---|---|
1 2/* 3 * Copyright (C) Igor Sysoev 4 * Copyright (C) NGINX, Inc. 5 */ 6 7#include <nxt_main.h> 8 --- 66 unchanged lines hidden (view full) --- 75 if (nxt_sendbuf_mem_coalesce(c->socket.task, &sb) != 0 || !sb.sync) { 76 77 jbs->job.thread_pool = c->u.thread_pool; 78 jbs->job.log = c->socket.log; 79 jbs->out = c->write; 80 c->write = NULL; 81 jbs->ready_handler = nxt_event_conn_job_sendfile_return; 82 | 1 2/* 3 * Copyright (C) Igor Sysoev 4 * Copyright (C) NGINX, Inc. 5 */ 6 7#include <nxt_main.h> 8 --- 66 unchanged lines hidden (view full) --- 75 if (nxt_sendbuf_mem_coalesce(c->socket.task, &sb) != 0 || !sb.sync) { 76 77 jbs->job.thread_pool = c->u.thread_pool; 78 jbs->job.log = c->socket.log; 79 jbs->out = c->write; 80 c->write = NULL; 81 jbs->ready_handler = nxt_event_conn_job_sendfile_return; 82 |
83 c->blocked = 1; | 83 c->block_read = 1; 84 c->block_write = 1; |
84 85 nxt_job_start(task, &jbs->job, nxt_event_conn_job_sendfile_handler); 86 return; 87 } 88 } 89 90 nxt_event_conn_job_sendfile_return(task, jbs, c); 91} --- 73 unchanged lines hidden (view full) --- 165 nxt_buf_t *b; 166 nxt_bool_t done; 167 nxt_conn_t *c; 168 nxt_job_sendfile_t *jbs; 169 170 jbs = obj; 171 c = data; 172 | 85 86 nxt_job_start(task, &jbs->job, nxt_event_conn_job_sendfile_handler); 87 return; 88 } 89 } 90 91 nxt_event_conn_job_sendfile_return(task, jbs, c); 92} --- 73 unchanged lines hidden (view full) --- 166 nxt_buf_t *b; 167 nxt_bool_t done; 168 nxt_conn_t *c; 169 nxt_job_sendfile_t *jbs; 170 171 jbs = obj; 172 c = data; 173 |
173 c->blocked = 0; | 174 c->block_read = 0; 175 c->block_write = 0; |
174 175 sent = jbs->sent; 176 c->sent += sent; 177 178 nxt_debug(task, "event conn sendfile sent:%z", sent); 179 180 b = jbs->out; 181 --- 76 unchanged lines hidden --- | 176 177 sent = jbs->sent; 178 c->sent += sent; 179 180 nxt_debug(task, "event conn sendfile sent:%z", sent); 181 182 b = jbs->out; 183 --- 76 unchanged lines hidden --- |