Commit Graph

3769 Commits (892591f9a6200f7de5e0a67235cb774c18246f79)
 

Author SHA1 Message Date
winlin 041040b846 ignore ingester when vhost disabled.
winlin eac5440559 merge from srs2
winlin da722b5b5d Merge pull request from tufang14/2.0release
srs reusable thread need join
tufang14 56bffb6646 Update srs_app_thread.cpp
winlin dbdd2f27b6 Merge pull request from FlowerWrong/2.0release
Add tcUrl to on_publish http hook for issue 
flowerwrong d42a58faf4 Keep blank of line
tufang14 233ff11172 srs reusable thread need join
winlin d24aef50ba for , support RTMP 302 api at protocol level.
flowerwrong 9ddd0054a1 Add tcUrl to on_publish http hook for issue
winlin f1e7e9d933 support gmd. change work_dir. hourglass. add utilies.
winlin c9b977d337 update donation
winlin 5338f21439 merge from srs2
winlin 8155e97b84 add keyword XCORE for coredump to identify the version. 2.0.207
winlin e150fb3f70 merge from srs2
winlin dc38ae1687 show first message when not show version.
winlin 9d22d09646 show signature of server.
winlin 973194c663 merge from srs2.
winlin 26211abf2e refine code.
winlin f516636448 refine code for hooks and http core.
winlin 79fdc4e766 fix bug for rtmp client use NULL ptr.
winlin 96a4428bdb refine the http request parse. edge retry timeout.
winlin 190db75835 refine code for nx_json modify the data when loads.
winlin 86a7db0adb refine edge ingester, use upstream adapter.
winlin 7ae2c6bf50 merge from srs2.
winlin eca46c03d2 refine code for consumer to refer the rtmp connection.
winlin 11e11005ac specifies the try default vhost
winlin d267b8fa19 fix bug for create connection with ip.
winlin a7bf4bfda5 refine code, ignore client when no ip.
winlin 49308dddfb update 2015 to 2016
winlin d0c74fa7cd update 2015 to 2016
winlin 384de15094 merge srs2
winlin d3139c52cc release 2.0.205, 2.0-alpha3.
winlin 714c13d88d merge from srs2
winlin 5d3a183f43 fix , always alloc big object at heap. 2.0.205
winlin 65b81a4e68 merge from srs2
winlin 8b24319ffb fix , ignore null connect props to make RED5 happy. 2.0.204
winlin 8d378cda2e for , when simple handshake, copy s1 to c2.
winlin b881166f9a merge from srs2
winlin c7850570c1 fix , thread terminate normally dispose bug. 2.0.203
winlin 5f915aa959 merge from srs2
winlin cee8c3d07d fix , failed when chunk size too small. 2.0.202
winlin e124aeb614 Merge branch '2.0release' into develop
winlin 69d191e53f refine the hls error log.
winlin 0ab64ccd2a merge from srs2.
winlin 40457e6cab default hls_on_error to continue. 2.0.201
winlin f6ff116505 refine code, persistence use isolate method.
winlin b486f6fe6b refine /api/v1/summaries, with code and server id.
winlin 9b3fdc74d8 fix bug for api, level should be string.
winlin 26d328e7f2 fix bug for api, level should be string.
winlin ffef3905af merge from srs2.