external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

merge from srs2 #558 #559

Browse source
This commit is contained in:
winlin 2016-01-09 16:06:22 +08:00
commit eac5440559
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/app/srs_app_http_hooks.cpp
View file

@ -144,6 +144,7 @@ int SrsHttpHooks::on_publish(string url, SrsRequest* req)
obj->set("ip", SrsJsonAny::str(req->ip.c_str()));
obj->set("vhost", SrsJsonAny::str(req->vhost.c_str()));
obj->set("app", SrsJsonAny::str(req->app.c_str()));
obj->set("tcUrl", SrsJsonAny::str(req->tcUrl.c_str()));
obj->set("stream", SrsJsonAny::str(req->stream.c_str()));
std::string data = obj->dumps();

5
trunk/src/app/srs_app_st.cpp
View file

@ -237,11 +237,6 @@ namespace internal
// readly terminated now.
really_terminated = true;
// when thread terminated normally, also disposed.
// we must set to disposed before the on_thread_stop, which may free the thread.
// @see https://github.com/ossrs/srs/issues/546
disposed = true;
handler->on_thread_stop();
srs_info("thread %s cycle finished", _name);
}