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 #391, copy request for async call.

Browse source
This commit is contained in:
winlin 2015-05-23 07:46:45 +08:00
parent 6bfb743aa0
commit 0bb90145ba
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -562,6 +562,7 @@ Supported operating systems and hardware:
### SRS 2.0 history ### SRS 2.0 history
* v2.0, 2015-05-23, fix [#391](https://github.com/simple-rtmp-server/srs/issues/391) copy request for async call.
* v2.0, 2015-05-22, fix [#397](https://github.com/simple-rtmp-server/srs/issues/397) the USER_HZ maybe not 100. 2.0.165 * v2.0, 2015-05-22, fix [#397](https://github.com/simple-rtmp-server/srs/issues/397) the USER_HZ maybe not 100. 2.0.165
* v2.0, 2015-05-22, for [#400](https://github.com/simple-rtmp-server/srs/issues/400), parse when got entire http header, by feilong. 2.0.164. * v2.0, 2015-05-22, for [#400](https://github.com/simple-rtmp-server/srs/issues/400), parse when got entire http header, by feilong. 2.0.164.
* v2.0, 2015-05-19, merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163. * v2.0, 2015-05-19, merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.

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

@ -498,12 +498,13 @@ int SrsFlvSegment::on_reload_vhost_dvr(std::string /*vhost*/)
SrsDvrAsyncCallOnDvr::SrsDvrAsyncCallOnDvr(SrsRequest* r, string p) SrsDvrAsyncCallOnDvr::SrsDvrAsyncCallOnDvr(SrsRequest* r, string p)
{ {
req = r; req = r->copy();
path = p; path = p;
} }
SrsDvrAsyncCallOnDvr::~SrsDvrAsyncCallOnDvr() SrsDvrAsyncCallOnDvr::~SrsDvrAsyncCallOnDvr()
{ {
srs_freep(req);
} }
int SrsDvrAsyncCallOnDvr::call() int SrsDvrAsyncCallOnDvr::call()

6
trunk/src/app/srs_app_hls.cpp
View file

@ -172,7 +172,7 @@ void SrsHlsSegment::update_duration(int64_t current_frame_dts)
SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(SrsRequest* r, string p, string t, string m, string mu, int s, double d) SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(SrsRequest* r, string p, string t, string m, string mu, int s, double d)
{ {
req = r; req = r->copy();
path = p; path = p;
ts_url = t; ts_url = t;
m3u8 = m; m3u8 = m;
@ -183,6 +183,7 @@ SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(SrsRequest* r, string p, string t, st
SrsDvrAsyncCallOnHls::~SrsDvrAsyncCallOnHls() SrsDvrAsyncCallOnHls::~SrsDvrAsyncCallOnHls()
{ {
srs_freep(req);
} }
int SrsDvrAsyncCallOnHls::call() int SrsDvrAsyncCallOnHls::call()
@ -221,12 +222,13 @@ string SrsDvrAsyncCallOnHls::to_string()
SrsDvrAsyncCallOnHlsNotify::SrsDvrAsyncCallOnHlsNotify(SrsRequest* r, string u) SrsDvrAsyncCallOnHlsNotify::SrsDvrAsyncCallOnHlsNotify(SrsRequest* r, string u)
{ {
req = r; req = r->copy();
ts_url = u; ts_url = u;
} }
SrsDvrAsyncCallOnHlsNotify::~SrsDvrAsyncCallOnHlsNotify() SrsDvrAsyncCallOnHlsNotify::~SrsDvrAsyncCallOnHlsNotify()
{ {
srs_freep(req);
} }
int SrsDvrAsyncCallOnHlsNotify::call() int SrsDvrAsyncCallOnHlsNotify::call()