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

Fix HTTP-FLV and VOD-FLV conflicting bug.

Browse source
This commit is contained in:
winlin 2019-12-17 16:01:04 +08:00
parent d9842b0371
commit 2df1dcb05a
4 changed files with 33 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1049,6 +1049,18 @@ srs_error_t SrsHttpStreamServer::hijack(ISrsHttpMessage* request, ISrsHttpHandle
return err;
}
}
// For HTTP-FLV stream, the template must have the same schema with upath.
// The template is defined in config, the mout of http stream. The upath is specified by http request path.
// If template is "[vhost]/[app]/[stream].flv", the upath should be:
// matched for "/live/livestream.flv"
// matched for "ossrs.net/live/livestream.flv"
// not-matched for "/livestream.flv", which is actually "/__defaultApp__/livestream.flv", HTTP not support default app.
// not-matched for "/live/show/livestream.flv"
string upath = request->path();
if (srs_string_count(upath, "/") != srs_string_count(entry->mount, "/")) {
return err;
}
// convert to concreate class.
SrsHttpMessage* hreq = dynamic_cast<SrsHttpMessage*>(request);