1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

merge with security bug fix.

This commit is contained in:
winlin 2015-01-05 12:09:15 +08:00
commit 67adc8dc61
7 changed files with 276 additions and 3 deletions

View file

@ -52,6 +52,7 @@ using namespace std;
#include <srs_core_performance.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_app_security.hpp>
#include <srs_app_statistic.hpp>
// when stream is busy, for example, streaming is already
// publishing, when a new client to request to publish,
@ -395,6 +396,8 @@ int SrsRtmpConn::stream_service_cycle()
}
srs_assert(source != NULL);
SrsStatistic::instance()->add_request_info(source, req);
// check ASAP, to fail it faster if invalid.
if (type != SrsRtmpConnPlay && !vhost_is_edge) {
// check publish available