Merge commit '762d7a8884af46d642c09dc682f5a8fa8f65975b' into 2.0release-bugfix

This commit is contained in:
cenxinwei 2017-01-18 10:24:07 +08:00
commit 7fe885a6db

View File

@ -871,7 +871,7 @@ int SrsRtmpConn::do_publishing(SrsSource* source, SrsPublishRecvThread* trd)
// initialize the publish timeout.
publish_1stpkt_timeout = _srs_config->get_publish_1stpkt_timeout(req->vhost);
publish_normal_timeout = _srs_config->get_publish_1stpkt_timeout(req->vhost);
publish_normal_timeout = _srs_config->get_publish_normal_timeout(req->vhost);
// set the sock options.
set_sock_options();