external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2016-11-24 18:12:31 +08:00
commit f6c8e02cca
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_server.cpp
View file

@ -657,7 +657,7 @@ int SrsServer::initialize_st()
// check asprocess.
bool asprocess = _srs_config->get_asprocess();
if (ppid == 1) {
if (asprocess && ppid == 1) {
ret = ERROR_SYSTEM_ASSERT_FAILED;
srs_error("for asprocess, ppid should never be init(1), ret=%d", ret);
return ret;