Commit Graph

2656 Commits (fb3fced8d01809787f2835587d3369cd591c32c6)
 

Author SHA1 Message Date
winlin b466756931 merge from feilong for bug #281. 10 years ago
winlin 27e0521ace fix #281, fix hls bug ignore type-9 send aud. 1.0.20 10 years ago
winlin 6c833902f9 merge http api from tufang. 2.0.92 10 years ago
winlin ac584a4db2 Merge pull request #279 from tufang14/develop
add client num for stream in statistic for #227
10 years ago
qiang.li 46d716612c add client num for stream in statistic 10 years ago
winlin 44f5efda21 refine the print info. 10 years ago
winlin 0e9c9db3f4 fix the aggregate bug, adjust to starttime of msg. 2.0.91 10 years ago
winlin 5aa31568ba fix the rtmp dump, parse the aggregate msg. 10 years ago
winlin 5661fc2676 refine dvr and rtmp dump, write the original data. 10 years ago
winlin a402ca7120 refine code, the consumer always alive longer than queue recv thread. 10 years ago
winlin 89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp 10 years ago
winlin 0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 10 years ago
qiang.li 08e9f6ef42 add play client num in statistic 10 years ago
tufang14 532a48409d Merge pull request #1 from winlinvip/develop
merge origin
10 years ago
winlin 4c18234678 Merge branch 'tufang14-develop' into develop 10 years ago
winlin f1efdcd000 refine code, use global virtual id to generate the id of vhost and stream. 10 years ago
winlin ae63af6a4a refine code, implements the stat.: 10 years ago
winlin 97bea51499 refine the api, response the error code and data. 10 years ago
winlin cc796a433a refine the statistic arch. 10 years ago
winlin 40ed2249e8 refine code to use the one coding style. 10 years ago
winlin 4bb17f0c81 replace the TAB with 4spaces 10 years ago
winlin 344ff24f66 add srs_app_statistic to upp project. 10 years ago
winlin 67adc8dc61 merge with security bug fix. 10 years ago
qiang.li a4a93613d0 add statistic for stream 10 years ago
winlin 32657b0a50 update readme 10 years ago
winlin 2ea1c4fb61 update readme for security 10 years ago
winlin dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 10 years ago
winlin dd2c7e0b4d hotfix to remove the pageUrl for http callback. 2.0.88 10 years ago
winlin 247b772449 hotfix to remove the pageUrl for http callback. 1.0.19 10 years ago
winlin 7f60d472e6 remove the change vhost forward. 10 years ago
winlin 45724bfaec update conf for transcode. 10 years ago
winlin 0b9bbdbe74 Merge branch '1.0release' into develop 10 years ago
winlin f9a33fbeee fix the compile failed for utest at 32bits cpus 10 years ago
qiang.li 8d534d3470 get stream info use http api #227 10 years ago
winlin f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 10 years ago
winlin f89941254a refine code of security deny check 10 years ago
winlin 18b15b9099 refine comments of security deny check 10 years ago
winlin 75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 10 years ago
winlin f8ec7c706d merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85 10 years ago
winlin e590537dca fix #207, trim the last 0 of log. 1.0.18 10 years ago
winlin 0530550f1d add niesongsong to contributors for configure support relative path 10 years ago
winlin a3cbd42ae3 add allspace to contributors for srs-librtmp windows support. 10 years ago
winlin 07b207b7e3 remove test code for api-server. 10 years ago
winlin 9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 10 years ago
winlin 8df0f724d6 fix #216, http-callback post in application/json content-type. 2.0.83 10 years ago
winlin ca977ef739 hotfix #216, http-callback post in application/json content-type. 1.0.17 10 years ago
winlin 518a5a72ab fix #263, srs-librtmp flv read tag should init size. 2.0.82 10 years ago
winlin c1c01ec802 hotfix #270, memory leak for http client post. 2.0.81 10 years ago
winlin bb6dfe40c1 fix #270, memory leak for http client post. 1.0.16 10 years ago
winlin 569596c10d update copyright, from 2013 to 2015 10 years ago