mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 02:09:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPDY: fixed possible request hang.

Browse Source 
Processing events from upstream connection can result in sending queued frames
from other streams.  In this case such streams were not added to handling queue
and properly handled.

A global per connection flag was replaced by a per stream flag that indicates
currently sending stream while all other streams can be added to handling
queue.
This commit is contained in:
Valentin Bartenev 2013-12-26 17:03:16 +04:00
parent 9b4a99cf5d
commit 75dad742e5
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/http/ngx_http_spdy.c
View File

@ -411,7 +411,7 @@ ngx_http_spdy_write_handler(ngx_event_t *wev)
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "spdy write handler"); ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "spdy write handler");
sc->blocked = 2; sc->blocked = 1;
rc = ngx_http_spdy_send_output_queue(sc); rc = ngx_http_spdy_send_output_queue(sc);
@ -430,8 +430,6 @@ ngx_http_spdy_write_handler(ngx_event_t *wev)
sc->last_stream = NULL; sc->last_stream = NULL;
sc->blocked = 1;
for ( /* void */ ; stream; stream = sn) { for ( /* void */ ; stream; stream = sn) {
sn = stream->next; sn = stream->next;
stream->handled = 0; stream->handled = 0;
@ -2658,6 +2656,15 @@ ngx_http_spdy_close_stream(ngx_http_spdy_stream_t *stream, ngx_int_t rc)
} }
} }
if (stream->handled) {
for (s = sc->last_stream; s; s = s->next) {
if (s->next == stream) {
s->next = stream->next;
break;
}
}
}
sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx, sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx,
ngx_http_spdy_module); ngx_http_spdy_module);
@ -2847,9 +2854,11 @@ ngx_http_spdy_finalize_connection(ngx_http_spdy_connection_t *sc,
stream = sc->streams_index[i]; stream = sc->streams_index[i];
while (stream) { while (stream) {
r = stream->request; stream->handled = 0;
r = stream->request;
fc = r->connection; fc = r->connection;
fc->error = 1; fc->error = 1;
if (stream->waiting) { if (stream->waiting) {

3
src/http/ngx_http_spdy.h
View File

@ -106,7 +106,7 @@ struct ngx_http_spdy_connection_s {
ngx_uint_t last_sid; ngx_uint_t last_sid;
unsigned blocked:2; unsigned blocked:1;
unsigned waiting:1; /* FIXME better name */ unsigned waiting:1; /* FIXME better name */
}; };
@ -125,6 +125,7 @@ struct ngx_http_spdy_stream_s {
unsigned priority:2; unsigned priority:2;
unsigned handled:1; unsigned handled:1;
unsigned blocked:1;
unsigned in_closed:1; unsigned in_closed:1;
unsigned out_closed:1; unsigned out_closed:1;
unsigned skip_data:2; unsigned skip_data:2;

8
src/http/ngx_http_spdy_filter_module.c
View File

@ -795,11 +795,15 @@ ngx_http_spdy_filter_get_data_frame(ngx_http_spdy_stream_t *stream,
static ngx_inline ngx_int_t static ngx_inline ngx_int_t
ngx_http_spdy_filter_send(ngx_connection_t *fc, ngx_http_spdy_stream_t *stream) ngx_http_spdy_filter_send(ngx_connection_t *fc, ngx_http_spdy_stream_t *stream)
{ {
stream->blocked = 1;
if (ngx_http_spdy_send_output_queue(stream->connection) == NGX_ERROR) { if (ngx_http_spdy_send_output_queue(stream->connection) == NGX_ERROR) {
fc->error = 1; fc->error = 1;
return NGX_ERROR; return NGX_ERROR;
} }
stream->blocked = 0;
if (stream->waiting) { if (stream->waiting) {
fc->buffered |= NGX_SPDY_WRITE_BUFFERED; fc->buffered |= NGX_SPDY_WRITE_BUFFERED;
fc->write->delayed = 1; fc->write->delayed = 1;
@ -946,17 +950,15 @@ ngx_http_spdy_handle_stream(ngx_http_spdy_connection_t *sc,
fc->write->delayed = 0; fc->write->delayed = 0;
if (stream->handled) { if (stream->handled || stream->blocked) {
return; return;
} }
if (sc->blocked == 2) {
stream->handled = 1; stream->handled = 1;
stream->next = sc->last_stream; stream->next = sc->last_stream;
sc->last_stream = stream; sc->last_stream = stream;
} }
}
static void static void