opensource/nginx-rtmp-module
1
0
Fork 0
mirror of https://github.com/arut/nginx-rtmp-module.git synced 2025-08-06 15:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

async client handshake switched to posted events

Browse Source
This commit is contained in:
Roman Arutyunyan
2012-12-27 17:19:54 +04:00
parent 06f4699399
commit cbccd06bab
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ngx_rtmp_handshake.c
View File

@ -379,7 +379,7 @@ ngx_rtmp_handshake_recv(ngx_event_t *rev)
if (rev->timedout) { if (rev->timedout) {
ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
"handshake: client timed out"); "handshake: recv: client timed out");
c->timedout = 1; c->timedout = 1;
ngx_rtmp_finalize_session(s); ngx_rtmp_finalize_session(s);
return; return;
@ -494,7 +494,7 @@ ngx_rtmp_handshake_send(ngx_event_t *wev)
if (wev->timedout) { if (wev->timedout) {
ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
"handshake: client timed out"); "handshake: send: client timed out");
c->timedout = 1; c->timedout = 1;
ngx_rtmp_finalize_session(s); ngx_rtmp_finalize_session(s);
return; return;
@ -609,10 +609,7 @@ ngx_rtmp_client_handshake(ngx_rtmp_session_t *s, unsigned async)
} }
if (async) { if (async) {
ngx_add_timer(c->write, s->timeout); ngx_post_event(c->write, &ngx_posted_events);
if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
ngx_rtmp_finalize_session(s);
}
return; return;
} }