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

572 commits

Author SHA1 Message Date
winlin
a2d6566019 Add kernel utility utest 2019-01-01 20:19:44 +08:00
winlin
0bc7fdbb35 Always enable SRS_SSL 2018-12-22 20:03:40 +08:00
winlin
f1ab8fecac Fix build warning 2018-12-09 22:48:47 +08:00
winlin
ef3e35f173 Fix build warning 2018-12-09 21:04:43 +08:00
winlin
4d157f2148 Fix build warning 2018-12-09 21:00:38 +08:00
winlin
dcc2a73e7a Refine kernel aac 2018-12-09 20:58:40 +08:00
winlin
24f46f5085 #1261, Support _definst_ for Wowza. 3.0.44 2018-11-11 13:51:10 +08:00
MakarovYaroslav
e62ac29f48 add ignoring _definst_ at the end of app (#1261) 2018-11-11 13:31:29 +08:00
MakarovYaroslav
a2480a6c94 fix bug with for loop (#1263) 2018-11-11 13:27:33 +08:00
winlin
ee068cf120 For #1109, Support without ssl for HLS key. 2018-08-25 21:15:26 +08:00
Harlan
22c5af62cf Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
2018-08-15 07:37:12 +08:00
Harlan
ac6b37de4b rewrite ff_data_to_hex 2018-08-12 14:10:18 +08:00
winlin
d607c7f905 Refine HTTP-FLV latency, support realtime mode.3.0.38 2018-08-05 20:30:04 +08:00
winlin
41c6e833b9 Replace hex to string to match MIT license. 3.0.33 2018-07-22 18:47:38 +08:00
winlin
84f81983aa Replace base64 to match MIT license. 3.0.32 2018-07-22 17:56:38 +08:00
winlin
0a63448b86 Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31 2018-07-22 15:21:05 +08:00
winlin
e395878916 Replace crc32 IEEE by golang to match MIT license. 3.0.30 2018-07-21 20:58:20 +08:00
winlin
dea5e5bb48 Add utest or CRC32 IEEE, refine TABs of code 2018-07-21 19:09:32 +08:00
winlin
608c88b8f2 Merge 2.0release 2018-07-21 17:52:12 +08:00
winlin
6d7c7418a8 Merge #1119, fix memory leak. 2.0.249 2018-07-21 17:49:46 +08:00
winlin
e4742ddac7 Merge 2.0release 2018-07-17 13:59:51 +08:00
Hui Zhang (huzhang2)
01ed485cf3 fix #1172 #1173 #1174 #1175
security scan report issue
2018-07-17 10:03:13 +08:00
Harlan
45a57acbb4 fix bug 2018-04-06 10:05:13 +08:00
Harlan
43ebd5958d fix bug that only one stream can be encrypted.. 2018-04-03 22:00:32 +08:00
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
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
c70421e656 Fix #464, support origin cluster 2018-02-16 16:39:07 +08:00
winlin
049e7c82c0 Merge #1044, for #1045, set TCP SO_KEEPALIVE 2018-01-07 17:23:36 +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
922a8f3a5c For #988, refine code. 2018-01-01 22:45:22 +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
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
9f5224c34a For #913, use complex error for http 2017-07-29 21:39:57 +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
6d4315fc3c Disable valgrind by default 2017-06-28 09:08:19 +08:00
winlin
b3825c4021 Fix warnings 2017-06-13 16:10:46 +08:00
winlin
9db2a04c3b For #913, coroutine support complex error. 2017-06-11 18:44:20 +08:00
winlin
b5c14938d9 For #913, config and log support complex error. 2017-06-11 14:03:19 +08:00
winlin
7cac35a289 For #913, source cycle error 2017-06-11 09:40:07 +08:00
winlin
7275fd5397 Fix #916, build failed for headers for error. 2017-06-11 09:03:29 +08:00
winlin
a20e2c3ef6 For #913, refine server utility 2017-06-10 15:20:48 +08:00
winlin
372a9e5cb3 Fix #915, string ends with 2017-06-10 08:42:42 +08:00
winlin
bb200b5d2d For #913, add complex error. 2017-06-09 11:50:35 +08:00
winlin
9ca36970aa Fix #908, use empty coroutine to avoid NULL pointer. 2017-06-04 19:13:56 +08:00