external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity
6058 commits 14 branches 107 tags 377 MiB
Commit graph

3812 commits

Author SHA1 Message Date
winlin
dba44c7c3f Merge branch 'develop' into 3.0release 2018-03-25 20:00:33 +08:00
xialixin
bb4e16ae3c fix create dir success result check (#1080) 2018-03-25 17:48:07 +08:00
xialixin
aaf2905a9d add: hls configuration adds [duration] variable (#1083) 2018-03-25 17:47:37 +08:00
Harlan
52596a0b04 add HLS encryption feature 2018-03-25 12:05:52 +08:00
winlin
0d78b908a7 Fix client tools resolve dns failed bug 2018-03-20 19:50:46 +08:00
winlin
bd797ad385 Fix utest build failed for ::atoi 2018-03-03 09:33:15 +08:00
winlin
459272b94c Merge #1077 from 2.0release 2018-02-28 14:10:09 +08:00
winlin
0fe17c3e34 Merge #1077, fix crash for edge HLS. 2.0.247 2018-02-28 13:37:30 +08:00
RocFang
fd016ed91a use hls->initialize to set req of hls (#1077) 2018-02-28 13:35:33 +08:00
winlin
4bf5ab2044 Fix #464, support RTMP origin cluster. 3.0.29 2018-02-16 16:40:48 +08:00
winlin
c70421e656 Fix #464, support origin cluster 2018-02-16 16:39:07 +08:00
winlin
2f09ec4353 For #464, refine result of origin cluster api 2018-02-16 14:13:14 +08:00
winlin
92f2bcd878 For #464, support config origin cluster 2018-02-16 10:31:19 +08:00
winlin
55c96192e2 For #464, refine code 2018-02-16 10:19:48 +08:00
winlin
ec362b2774 For #464, query origin info and ip addresses 2018-02-16 09:37:31 +08:00
winlin
469250f850 For #464, support origin cluster api 2018-02-15 20:55:34 +08:00
winlin
d0fbf44d18 For #464, support config for origin cluster. 2018-02-14 21:52:40 +08:00
winlin
db6b8cf914 Fix #1057, switch to simple handshake. 3.0.28 2018-02-13 09:05:01 +08:00
winlin
a2cefe4dbd For #1059, show more information from stream 2018-02-13 09:02:46 +08:00
winlin
681138d2af Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27 2018-02-13 08:52:57 +08:00
winlin
1721e4ea4b Fix #1059, support vhost in stream parameters. 2.0.246 2018-02-13 08:31:25 +08:00
winlin
93d3e1464a For #1045, revert macro for TCP keepalive detection, use system macro 2018-01-07 17:49:57 +08:00
winlin
366309ce2d For #1045, revert macro for TCP keepalive detection, use system macro 2018-01-07 17:49:14 +08:00
winlin
049e7c82c0 Merge #1044, for #1045, set TCP SO_KEEPALIVE 2018-01-07 17:23:36 +08:00
winlin
911cd448f1 Merge #1045, for #1044, TCP connection alive detection. 2.0.245 2018-01-07 17:18:43 +08:00
juntaoliu
a6871052af set tcp keepalive for tcp socket (#1045) 2018-01-07 17:03:13 +08:00
winlin
ca1395a807 Change date from 2017 to 2018 2018-01-07 10:58:53 +08:00
winlin
5730bf8e43 Fix #913, support complex error. 3.0.26 2018-01-01 23:03:42 +08:00
winlin
b426036832 Merge #1033, allow user to add some specific flags. 2.0.244 2018-01-01 23:01:13 +08:00
winlin
922a8f3a5c For #988, refine code. 2018-01-01 22:45:22 +08:00
winlin
823dc2df21 Refine help 2018-01-01 22:44:48 +08:00
Thomas Dreibholz
feaae341b9 IPv6 support (for 3.0 release) (#988) 
* IPv6 support, part 1.

* IPv6 support, part 2.

* Some more IPv6 work.

* Made functions for address:port paŕsing IPv6-capable.

* Fixed type (compile warning).

* Fixed formatting.

* Reverted option change.

* Replaced abort() by proper error handling.

* Also retrieving local IPv6 addresses now.
 2018-01-01 22:43:58 +08:00
winlin
db08f1586c For #913, APP support complex error. 2018-01-01 22:32:54 +08:00
winlin
e2c1f58674 For #913, APP support complex error. 2018-01-01 21:20:57 +08:00
winlin
6eae93258a For #913, APP support complex error. 2018-01-01 19:39:57 +08:00
winlin
aebbbadf42 For #913, Service support complex error. 2018-01-01 11:41:15 +08:00
winlin
15aea686c3 For #913, KAFKA, RTSP support complex error. 2018-01-01 10:30:31 +08:00
winlin
70a20ffadb For #913, RTMP support complex error. 2018-01-01 09:38:22 +08:00
winlin
60accb6e54 For #913, AMF0 and RTMP support complex error. 2017-12-31 20:52:04 +08:00
winlin
204ef041da For #913, Kernel MP4 FLV HTTP support complex error. 2017-12-31 12:11:48 +08:00
winlin
9802dc326e For #913, source support complex error 2017-09-23 22:12:33 +08:00
winlin
abcaba33ee For #913: TS/HLS/MPEGTS support complex error 2017-09-22 21:50:54 +08:00
winlin
20a42599f3 For #913, http callback use complex error 2017-09-22 19:54:50 +08:00
winlin
fd91df9411 For #913, reload use complex error 2017-09-22 16:14:30 +08:00
winlin
baa55f14b9 Change stable release to SRS2 2017-08-19 20:19:35 +08:00
winlin
9f5224c34a For #913, use complex error for http 2017-07-29 21:39:57 +08:00
winlin
661eb8b37c For #913, use complex error for reload utc time 2017-07-29 20:02:38 +08:00
winlin
5c9a12e72a For #913, use complex error for listener 2017-07-29 12:45:17 +08:00
winlin
71dd3f3137 For #913, use complex error for server handler. 2017-07-18 20:24:07 +08:00
winlin
e135ab59d9 Fix the utest failed for chunk_size 2017-06-28 09:44:10 +08:00