mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-25 22:56:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

HTTP/2: refactored ngx_http_v2_send_output_queue().

Browse Source 
Now it returns NGX_AGAIN if there's still data to be sent.
This commit is contained in:
Valentin Bartenev 2016-07-19 20:34:02 +03:00
parent 3b2f54bc2e
commit 3c81c08cea
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/http/v2/ngx_http_v2.c
View File

@ -478,7 +478,7 @@ ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
wev = c->write; wev = c->write;
if (!wev->ready) { if (!wev->ready) {
return NGX_OK; return NGX_AGAIN;
} }
cl = NULL; cl = NULL;
@ -549,15 +549,6 @@ ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
c->tcp_nodelay = NGX_TCP_NODELAY_SET; c->tcp_nodelay = NGX_TCP_NODELAY_SET;
} }
if (!wev->ready) {
ngx_add_timer(wev, clcf->send_timeout);
} else {
if (wev->timer_set) {
ngx_del_timer(wev);
}
}
for ( /* void */ ; out; out = fn) { for ( /* void */ ; out; out = fn) {
fn = out->next; fn = out->next;
@ -582,6 +573,15 @@ ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
h2c->last_out = frame; h2c->last_out = frame;
if (!wev->ready) {
ngx_add_timer(wev, clcf->send_timeout);
return NGX_AGAIN;
}
if (wev->timer_set) {
ngx_del_timer(wev);
}
return NGX_OK; return NGX_OK;
error: error: