merge from srs2 #558 #559

ossrs · Jan 9, 2016 · eac5440 · eac5440
2 parents d24aef5 + da722b5
commit eac5440
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/trunk/src/app/srs_app_http_hooks.cpp b/trunk/src/app/srs_app_http_hooks.cpp
@@ -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();

diff --git a/trunk/src/app/srs_app_st.cpp b/trunk/src/app/srs_app_st.cpp
@@ -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);
     }