mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-10 11:38:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPDY: fixed error handling in ngx_http_spdy_send_output_queue().

Browse Source
This commit is contained in:
Valentin Bartenev 2015-03-23 20:47:46 +03:00
parent 67986d81de
commit 44586bf5ee
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/http/ngx_http_spdy.c
View File

@ -700,20 +700,14 @@ ngx_http_spdy_send_output_queue(ngx_http_spdy_connection_t *sc)
cl = c->send_chain(c, cl, 0); cl = c->send_chain(c, cl, 0);
if (cl == NGX_CHAIN_ERROR) { if (cl == NGX_CHAIN_ERROR) {
c->error = 1; goto error;
if (!sc->blocked) {
ngx_post_event(wev, &ngx_posted_events);
}
return NGX_ERROR;
} }
clcf = ngx_http_get_module_loc_conf(sc->http_connection->conf_ctx, clcf = ngx_http_get_module_loc_conf(sc->http_connection->conf_ctx,
ngx_http_core_module); ngx_http_core_module);
if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
return NGX_ERROR; /* FIXME */ goto error;
} }
if (cl) { if (cl) {
@ -751,6 +745,16 @@ ngx_http_spdy_send_output_queue(ngx_http_spdy_connection_t *sc)
sc->last_out = frame; sc->last_out = frame;
return NGX_OK; return NGX_OK;
error:
c->error = 1;
if (!sc->blocked) {
ngx_post_event(wev, &ngx_posted_events);
}
return NGX_ERROR;
} }