winlin
Committed by GitHub

Merge pull request #748 from censhanhe/2.0release-bugfix

2.0release bugfix publish_normal_timeout 配置读取错误
@@ -871,7 +871,7 @@ int SrsRtmpConn::do_publishing(SrsSource* source, SrsPublishRecvThread* trd) @@ -871,7 +871,7 @@ int SrsRtmpConn::do_publishing(SrsSource* source, SrsPublishRecvThread* trd)
871 871
872 // initialize the publish timeout. 872 // initialize the publish timeout.
873 publish_1stpkt_timeout = _srs_config->get_publish_1stpkt_timeout(req->vhost); 873 publish_1stpkt_timeout = _srs_config->get_publish_1stpkt_timeout(req->vhost);
874 - publish_normal_timeout = _srs_config->get_publish_1stpkt_timeout(req->vhost); 874 + publish_normal_timeout = _srs_config->get_publish_normal_timeout(req->vhost);
875 875
876 // set the sock options. 876 // set the sock options.
877 set_sock_options(); 877 set_sock_options();