Commit Graph

4139 Commits (62b7204514cb224917466d10b09077e74ca1c508)
 

Author SHA1 Message Date
winlin 384de15094 merge srs2 9 years ago
winlin d3139c52cc release 2.0.205, 2.0-alpha3. 9 years ago
winlin 714c13d88d merge from srs2 9 years ago
winlin 5d3a183f43 fix #509, always alloc big object at heap. 2.0.205 9 years ago
winlin 65b81a4e68 merge from srs2 9 years ago
winlin 8b24319ffb fix #418, ignore null connect props to make RED5 happy. 2.0.204 9 years ago
winlin 8d378cda2e for #418, when simple handshake, copy s1 to c2. 9 years ago
winlin b881166f9a merge from srs2 9 years ago
winlin c7850570c1 fix #546, thread terminate normally dispose bug. 2.0.203 9 years ago
winlin 5f915aa959 merge from srs2 9 years ago
winlin cee8c3d07d fix #541, failed when chunk size too small. 2.0.202 9 years ago
winlin e124aeb614 Merge branch '2.0release' into develop 9 years ago
winlin 69d191e53f refine the hls error log. 9 years ago
winlin 0ab64ccd2a merge from srs2. 9 years ago
winlin 40457e6cab default hls_on_error to continue. 2.0.201 9 years ago
winlin f6ff116505 refine code, persistence use isolate method. 9 years ago
winlin b486f6fe6b refine /api/v1/summaries, with code and server id. 9 years ago
winlin 9b3fdc74d8 fix bug for api, level should be string. 9 years ago
winlin 26d328e7f2 fix bug for api, level should be string. 9 years ago
winlin ffef3905af merge from srs2. 9 years ago
winlin 5660e24953 fast stop server. 9 years ago
winlin 2830ee12c1 fix the on_hls.ts_url bug. 9 years ago
winlin 1e4c8f8bf3 fast stop server. 9 years ago
winlin 3ab5892863 refine comments. 9 years ago
winlin 5ac8177ce6 fix bugs 9 years ago
winlin fabcc91a0e refine codes. 9 years ago
winlin b2ae1acaa4 copy http-parser-2.1 into srs http stack. 9 years ago
winlin fba1122835 private the srs_vhost_resolve 9 years ago
winlin 17bb31cab1 fix the config bug. 9 years ago
winlin eec2c34b5c refine publisher. 9 years ago
winlin cfe230438a revert test code 9 years ago
winlin 6191e0af90 s1 compute key. 9 years ago
winlin cafe886c3f merge srs2 9 years ago
winlin 34d1ce9922 update readme, add gitter. 9 years ago
winlin 18eb8c81b3 merge from srs2 9 years ago
winlin 2310b2da59 fix #518, fix fd leak bug when fork. 2.0.200 9 years ago
winlin 803c899a9b Merge pull request #530 from YueHonghui/2.0release
fix bug of fd leek in srs_app_server
9 years ago
YueHonghui eb4ca9ff5d fix bug of fd leek in srs_app_server 9 years ago
winlin 51ed4b1e82 update donation 9 years ago
winlin 7ea0394b67 update donations 9 years ago
winlin c77cefb6fa refine the position of log script 9 years ago
winlin 44b26271bf Merge branch '2.0release' into develop 9 years ago
winlin c4c63f7825 fix build failed bug for osx. 9 years ago
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs 9 years ago
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs 9 years ago
winlin 6c7a51d310 Merge branch '2.0release' into develop 9 years ago
winlin 1d8318d2fc change simple-rtmp-server org to ossrs 9 years ago
winlin d2ccc4f661 Merge branch '2.0release' into develop 9 years ago
winlin 1c944ed451 Merge pull request #522 from ossrs/hotfix/commit
use /usr/local/bin for osx.
9 years ago
winlin 8c04b17d08 use /usr/local/bin for osx. 9 years ago