zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-17 00:51:09 +02:00
Code Issues Projects Releases Wiki Activity

on_update now does not terminate connection on empty or broken HTTP response

Browse source
This commit is contained in:
Roman Arutyunyan 2012-11-16 17:01:58 +04:00
parent 0c1ac736ec
commit 96902cf81a
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ngx_rtmp_notify_module.c
View file

@ -554,9 +554,15 @@ ngx_rtmp_notify_parse_http_retcode(ngx_rtmp_session_t *s,
}
ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
"notify: invalid HTTP response");
"notify: empty or broken HTTP response");
return NGX_ERROR;
/*
* not enough data;
* it can happen in case of empty or broken reply;
* let the caller decide if that's an error or not
*/
return NGX_DONE;
}
@ -591,7 +597,12 @@ ngx_rtmp_notify_update_handle(ngx_rtmp_session_t *s,
ngx_rtmp_notify_app_conf_t *nacf;
ngx_rtmp_notify_ctx_t *ctx;
if (ngx_rtmp_notify_parse_http_retcode(s, in) != NGX_OK) {
/*
* check only for NGX_ERROR;
* empty or broken reply is not an error in this case
*/
if (ngx_rtmp_notify_parse_http_retcode(s, in) == NGX_ERROR) {
ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
"notify: update failed");
@ -637,7 +648,13 @@ ngx_rtmp_notify_update(ngx_event_t *e)
ci.create = ngx_rtmp_notify_update_create;
ci.handle = ngx_rtmp_notify_update_handle;
ngx_rtmp_netcall_create(s, &ci);
if (ngx_rtmp_netcall_create(s, &ci) == NGX_OK) {
return;
}
/* schedule next update on connection error */
ngx_rtmp_notify_update_handle(s, NULL, NULL);
}