mirror of
https://github.com/ossrs/srs.git
synced 2025-02-12 11:21:52 +00:00
Fix #2311, Copy the request for stat client. 3.0.162
This commit is contained in:
parent
b7af726ffc
commit
71dda68f62
4 changed files with 9 additions and 2 deletions
|
@ -140,6 +140,7 @@ Other important wiki:
|
|||
|
||||
## V3 changes
|
||||
|
||||
* v3.0, 2021-05-12, Fix [#2311][bug #2311], Copy the request for stat client. 3.0.162
|
||||
* <strong>v3.0, 2021-04-28, [3.0 release5(3.0.161)][r3.0r5] released. 122750 lines.</strong>
|
||||
* v3.0, 2021-04-28, Upgrade players. 3.0.161
|
||||
* <strong>v3.0, 2021-04-24, [3.0 release4(3.0.160)][r3.0r4] released. 122750 lines.</strong>
|
||||
|
@ -1718,6 +1719,7 @@ Winlin
|
|||
[bug #1987]: https://github.com/ossrs/srs/issues/1987
|
||||
[bug #1548]: https://github.com/ossrs/srs/issues/1548
|
||||
[bug #1694]: https://github.com/ossrs/srs/issues/1694
|
||||
[bug #2311]: https://github.com/ossrs/srs/issues/2311
|
||||
[bug #yyyyyyyyyyyyy]: https://github.com/ossrs/srs/issues/yyyyyyyyyyyyy
|
||||
|
||||
[exo #828]: https://github.com/google/ExoPlayer/pull/828
|
||||
|
|
|
@ -938,6 +938,7 @@ srs_error_t SrsHttpStreamServer::http_mount(SrsSource* s, SrsRequest* r)
|
|||
}
|
||||
srs_trace("http: mount flv stream for sid=%s, mount=%s", sid.c_str(), mount.c_str());
|
||||
} else {
|
||||
// The entry exists, we reuse it and update the request of stream and cache.
|
||||
entry = sflvs[sid];
|
||||
entry->stream->update(s, r);
|
||||
entry->cache->update(s, r);
|
||||
|
|
|
@ -425,10 +425,14 @@ srs_error_t SrsStatistic::on_client(std::string id, SrsRequest* req, SrsConnecti
|
|||
|
||||
// got client.
|
||||
client->conn = conn;
|
||||
client->req = req;
|
||||
client->type = type;
|
||||
stream->nb_clients++;
|
||||
vhost->nb_clients++;
|
||||
|
||||
// The req might be freed, in such as SrsLiveStream::update, so we must copy it.
|
||||
// @see https://github.com/ossrs/srs/issues/2311
|
||||
srs_freep(client->req);
|
||||
client->req = req->copy();
|
||||
|
||||
return err;
|
||||
}
|
||||
|
|
|
@ -24,6 +24,6 @@
|
|||
#ifndef SRS_CORE_VERSION3_HPP
|
||||
#define SRS_CORE_VERSION3_HPP
|
||||
|
||||
#define SRS_VERSION3_REVISION 161
|
||||
#define SRS_VERSION3_REVISION 162
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue