R3944Realms/srs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
Show Stats 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. // check asprocess.
bool asprocess = _srs_config->get_asprocess(); bool asprocess = _srs_config->get_asprocess();
if (ppid == 1) { if (asprocess && ppid == 1) {
ret = ERROR_SYSTEM_ASSERT_FAILED; ret = ERROR_SYSTEM_ASSERT_FAILED;
srs_error("for asprocess, ppid should never be init(1), ret=%d", ret); srs_error("for asprocess, ppid should never be init(1), ret=%d", ret);
return ret; return ret;