external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

fix the http flv mount bug.

Browse source
This commit is contained in:
winlin 2015-07-14 11:31:17 +08:00
parent 9743e02541
commit d995726fee
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
trunk/src/app/srs_app_http_stream.cpp
View file

@ -805,7 +805,14 @@ int SrsHttpStreamServer::http_mount(SrsSource* s, SrsRequest* r)
entry->cache = new SrsStreamCache(s, r); entry->cache = new SrsStreamCache(s, r);
entry->stream = new SrsLiveStream(s, r, entry->cache); entry->stream = new SrsLiveStream(s, r, entry->cache);
srs_assert(!tmpl->req); // TODO: FIXME: maybe refine the logic of http remux service.
// if user push streams followed:
// rtmp://test.com/live/stream1
// rtmp://test.com/live/stream2
// and they will using the same template, such as: [vhost]/[app]/[stream].flv
// so, need to free last request object, otherwise, it will cause memory leak.
srs_freep(tmpl->req);
tmpl->source = s; tmpl->source = s;
tmpl->req = r->copy(); tmpl->req = r->copy();
@ -1170,8 +1177,8 @@ int SrsHttpStreamServer::hijack(ISrsHttpMessage* request, ISrsHttpHandler** ph)
std::string sid = r->get_stream_url(); std::string sid = r->get_stream_url();
// check if the stream is enabled. // check if the stream is enabled.
if (sflvs.find(sid) != sflvs.end()) { if (sflvs.find(sid) != sflvs.end()) {
SrsLiveEntry* entry = sflvs[sid]; SrsLiveEntry* s_entry = sflvs[sid];
if (!entry->stream->entry->enabled) { if (!s_entry->stream->entry->enabled) {
srs_error("stream is disabled, hijack failed. ret=%d", ret); srs_error("stream is disabled, hijack failed. ret=%d", ret);
return ret; return ret;
} }