From a09b5b6e6c6b6dcdcb3df5dcad14250cd05b03e5 Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Tue, 18 Dec 2012 20:38:08 +0400 Subject: [PATCH] fixed default ping value --- ngx_rtmp_core_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ngx_rtmp_core_module.c b/ngx_rtmp_core_module.c index f420c87..debe3be 100644 --- a/ngx_rtmp_core_module.c +++ b/ngx_rtmp_core_module.c @@ -252,7 +252,7 @@ ngx_rtmp_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) ngx_rtmp_core_srv_conf_t *conf = child; ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 60000); - ngx_conf_merge_msec_value(conf->ping, prev->ping, 1); + ngx_conf_merge_msec_value(conf->ping, prev->ping, 60000); ngx_conf_merge_msec_value(conf->ping_timeout, prev->ping_timeout, 30000); ngx_conf_merge_value(conf->so_keepalive, prev->so_keepalive, 0);