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 2015-07-21 11:41:13 +08:00
commit 48c040c92b
6 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -203,7 +203,8 @@ int SrsHttpHooks::on_play(string url, SrsRequest* req)
<< SRS_JFIELD_STR("ip", req->ip) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("vhost", req->vhost) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("app", req->app) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("stream", req->stream)
<< SRS_JFIELD_STR("stream", req->stream) << SRS_JFIELD_CONT
<< SRS_JFIELD_STR("pageUrl", req->pageUrl)
<< SRS_JOBJECT_END;
std::string data = ss.str();

1
trunk/src/app/srs_app_reload.hpp
View file

@ -57,6 +57,7 @@ public:
virtual int on_reload_http_stream_disabled();
virtual int on_reload_http_stream_updated();
public:
// TODO: FIXME: should rename to http_static
virtual int on_reload_vhost_http_updated();
virtual int on_reload_vhost_http_remux_updated(std::string vhost);
virtual int on_reload_vhost_added(std::string vhost);

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

@ -1270,6 +1270,7 @@ int SrsServer::on_reload_vhost_added(std::string vhost)
return ret;
}
// TODO: FIXME: should handle the event in SrsHttpStaticServer
if ((ret = on_reload_vhost_http_updated()) != ERROR_SUCCESS) {
return ret;
}
@ -1283,6 +1284,7 @@ int SrsServer::on_reload_vhost_removed(std::string /*vhost*/)
int ret = ERROR_SUCCESS;
#ifdef SRS_AUTO_HTTP_SERVER
// TODO: FIXME: should handle the event in SrsHttpStaticServer
if ((ret = on_reload_vhost_http_updated()) != ERROR_SUCCESS) {
return ret;
}
@ -1335,6 +1337,7 @@ int SrsServer::on_reload_http_stream_disabled()
return ret;
}
// TODO: FIXME: rename to http_remux
int SrsServer::on_reload_http_stream_updated()
{
int ret = ERROR_SUCCESS;
@ -1344,6 +1347,7 @@ int SrsServer::on_reload_http_stream_updated()
return ret;
}
// TODO: FIXME: should handle the event in SrsHttpStaticServer
if ((ret = on_reload_vhost_http_updated()) != ERROR_SUCCESS) {
return ret;
}