external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity
4509 commits 13 branches 107 tags 375 MiB
Commit graph

1543 commits

Author SHA1 Message Date
winlin
3fe338d1c5 for #742, use ms for application clock tbn. 2017-01-17 12:25:30 +08:00
winlin
dca9749f37 for #742, refine the object live cycle. 3.0.15 2017-01-17 10:44:13 +08:00
winlin
f4c0af8bfc refine code remove dup api for #742 2017-01-16 16:20:34 +08:00
winlin
1ed5118246 refine the spaces, no TABS 2017-01-16 15:47:26 +08:00
winlin
750f4413c8 merge srs2 for #536 2017-01-16 12:47:48 +08:00
winlin
142a9733b2 refine encoder code for #536. 2017-01-16 12:42:25 +08:00
winlin
ccb250f3bc merge srs2. convert ts aac audio private stream 1 to common. 2017-01-11 17:43:29 +08:00
winlin
e6eafd3b97 fix #740, convert ts aac audio private stream 1 to common. 2.0.229 2017-01-11 17:42:34 +08:00
winlin
7fe60b5bbf fix #735 config transform refer_publish invalid. 3.0.14 2017-01-11 09:45:22 +08:00
winlin
7bbb3bae42 merge srs2 2017-01-11 09:33:26 +08:00
winlin
e3aa34ec5f fix #736, recovery the hls dispose. 2.0.227 2017-01-11 09:25:48 +08:00
Himer
afa704bca5 Update srs_app_source.cpp 
enabled 为true才进行转发实例创建
 2017-01-10 21:16:49 +08:00
winlin
a1ae48f4ac Merge branch '2.0release' into develop 2017-01-10 18:07:52 +08:00
winlin
6fbda2ae3f for #635, refine hls open/close gop. 2017-01-10 18:07:46 +08:00
winlin
ae1920e91a Merge branch '2.0release' into develop 2017-01-10 17:17:31 +08:00
winlin
4104f25069 for #635, support IDR and NonIDR(open-gop). 2017-01-10 17:17:23 +08:00
winlin
1dd877c0d6 merge srs2 2017-01-10 11:17:37 +08:00
winlin
c9a71b7fb2 fix #635, hls support NonIDR(open gop). 2.0.226 2017-01-10 11:14:20 +08:00
winlin
d49f195bbf fix #734, log format error. 2017-01-10 09:36:51 +08:00
winlin
1b175b1107 for #730, support config in/out ack size. 3.0.13 2017-01-06 14:57:54 +08:00
winlin
4709d0214c for #711, support prefile for transcode. 3.0.12 2017-01-06 10:39:37 +08:00
winlin
8bdf50b14d update feature list 2017-01-05 09:29:12 +08:00
winlin
f2efa96015 for #324, always enable hstrs. 3.0.10 2017-01-05 09:08:56 +08:00
winlin
7ac932cfa0 update to 2013-2017 2016-12-16 11:57:25 +08:00
winlin
b231550c32 fix #717, #691, http api/static/stream support cors. 3.0.9 2016-12-15 16:22:04 +08:00
winlin
f6661989af fix typo for #513, #691 2016-12-15 15:00:08 +08:00
winlin
664844b5f5 merge from srs2. for #513. 2016-12-15 14:54:09 +08:00
winlin
759c84a395 for #513, remove hls ram from srs2 to srs3+. 2.0.224 2016-12-15 14:48:38 +08:00
winlin
f30b3073a2 refine the cros of api for flv 2016-12-15 14:10:02 +08:00
winlin
3df8f11884 refine thread stop 2016-12-14 18:21:50 +08:00
winlin
8935fe8897 merge srs2. 2016-12-13 18:43:22 +08:00
winlin
aca8a79d95 fix #713, disable the source cleanup. 2.0.223 2016-12-13 18:41:45 +08:00
winlin
9ba4bed648 merge srs2 2016-12-13 17:58:42 +08:00
winlin
cb1d47bfef fix #713, refine source to avoid critical fetch and create. 2.0.222 2016-12-13 17:57:49 +08:00
winlin
439c67018d remove unused macros. 2016-12-09 15:58:59 +08:00
winlin
2955b1fd2d support log rotate signal SIGUSR1. 3.0.8 2016-12-08 18:23:22 +08:00
winlin
2d387035cd refine the global variables. 2016-12-08 17:26:04 +08:00
winlin
b06203e777 dispose kafka 2016-12-08 11:48:50 +08:00
winlin
9a3674c624 refine kafka 2016-12-08 11:44:49 +08:00
winlin
f6c8e02cca Merge branch '2.0release' into develop 2016-11-24 18:12:31 +08:00
ME_Kun_Han
ec4d1b3b4f fix bug: run srs at startup failed. (#454) 2016-11-24 18:05:43 +08:00
winlin
0a8d40925f merge from 2.0 2016-11-09 09:44:19 +08:00
ME_Kun_Han
f107f404ea fix bug for issues #654 (#426) 2016-11-05 10:46:24 +08:00
winlin
5796e4bf89 merge from srs2 2016-10-26 09:53:27 +08:00
hankun
4f09bcce9f fix the bug: when trying to push same stream more than twice, to play it through http-flv will cause a core dump(#666) 2016-10-20 10:49:59 +08:00
winlin
112d98ffdb merge srs2. 2016-10-10 11:56:10 +08:00
ME_Kun_Han
7058411cb8 fix the core dump when trying to close srs (#386) 2016-10-10 11:51:49 +08:00
winlin
3659eec9d1 update the cwd 2016-09-23 15:37:51 +08:00
winlin
0e308b0fa1 merge srs2, support oryx 2016-09-23 15:33:43 +08:00
winlin
07fe35f11d support asprocess for oryx. 2.0.218 2016-09-23 15:17:46 +08:00
winlin
b748fac23a support asprocess for oryx. 2.0.218 2016-09-23 15:00:50 +08:00
winlin
2a01540433 support change work_dir for oryx. 2016-09-23 14:53:58 +08:00
winlin
b5d466f3d2 update utest 2016-09-15 14:47:42 +08:00
winlin
09895fcfc2 Merge branch '2.0release' into develop 2016-09-09 11:03:39 +08:00
Star Brilliant
a164c90e28 Flush the stdout buffer after logging to console 
Normally if the stdout is connected to a PTY, the stdout buffer is flushed automatically after each \n.
However if I run SRS under Docker, the stdout is not connected to a PTY (unless I ask it to), causing the last log line to be incomplete (showing only half).
By adding fflush, we could make sure each log line is completely shown, whenever the stdout is connected to a PTY or not.
 2016-09-08 07:58:52 -05:00
winlin
b24d1de377 Merge branch '2.0release' into develop 2016-09-05 14:56:41 +08:00
winlin
590e951739 fix memory leak of source. 2016-09-05 14:56:31 +08:00
winlin
0e9318e5d8 merge from 2.0 2016-09-05 14:16:24 +08:00
winlin
c7b97aa1c3 fix memory leak at source. 2.0.214 2016-09-05 14:13:37 +08:00
winlin
8ad7da1cb6 merge from 2.0 2016-09-02 15:25:20 +08:00
xubin
49853d2b8a 修复forward崩溃 2016-09-02 15:10:43 +08:00
winlin
7d96a33207 Merge branch '2.0release' into develop 2016-09-01 16:51:18 +08:00
winlin
e2865c6ac1 workaround for #511, the fly stfd in close. 2.0.211 2016-09-01 16:51:09 +08:00
winlin
36eb0981ec merge from 2.0release 2016-08-08 14:09:10 +08:00
intliang
3fbe9d2442 fixed crash by improper srs_info use. 2016-08-08 14:07:19 +08:00
winlin
eed4626c35 use larger limit 2016-03-10 12:28:46 +08:00
winlin
8db25a0bf5 fix the log for mmap. 2016-01-21 16:18:42 +08:00
winlin
214eda745d open null dev, not close stdout or stderr. 2016-01-20 14:53:25 +08:00
winlin
03469fc37d refine code for process fork. 2016-01-20 14:09:14 +08:00
winlin
ce8f3b4478 refine the dup2 of stdout and stderr. 2016-01-20 14:05:48 +08:00
winlin
ae8bd4c2aa should never close the fd 3+, for it myabe used. 2016-01-20 14:01:18 +08:00
winlin
a6dc17a67d support redirect stdout by > 2016-01-20 14:00:01 +08:00
winlin
dfe5306327 fix process bug. 2016-01-13 16:18:50 +08:00
winlin
61c0c168b9 merge from srs2. 2016-01-13 12:52:19 +08:00
winlin
266397acee merge from srs2 2016-01-13 12:46:23 +08:00
winlin
28080efec8 fix http reader bug, support infinite chunkted. 2.0.209 2016-01-13 12:44:51 +08:00
winlin
f971538cf3 refine http, support no host. 2016-01-12 11:53:52 +08:00
winlin
2941328ee8 rtmp edge support 302 redirect. 2016-01-11 15:46:23 +08:00
winlin
d81b2cb140 support hls mount to vhost and reload 2016-01-11 13:15:46 +08:00
winlin
041040b846 ignore ingester when vhost disabled. 2016-01-11 13:11:14 +08:00
winlin
eac5440559 merge from srs2 #558 #559 2016-01-09 16:06:22 +08:00
winlin
da722b5b5d Merge pull request #559 from tufang14/2.0release 
srs reusable thread need join
 2016-01-09 16:00:58 +08:00
tufang14
56bffb6646 Update srs_app_thread.cpp 2016-01-09 15:54:23 +08:00
flowerwrong
d42a58faf4 Keep blank of line 2016-01-09 15:10:24 +08:00
tufang14
233ff11172 srs reusable thread need join 2016-01-09 14:58:40 +08:00
flowerwrong
9ddd0054a1 Add tcUrl to on_publish http hook for issue #548 2016-01-08 15:10:25 +08:00
winlin
f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 2016-01-08 13:58:19 +08:00
winlin
5338f21439 merge from srs2 2016-01-05 16:58:21 +08:00
winlin
8155e97b84 add keyword XCORE for coredump to identify the version. 2.0.207 2016-01-05 16:49:27 +08:00
winlin
dc38ae1687 show first message when not show version. 2016-01-04 17:41:16 +08:00
winlin
9d22d09646 show signature of server. 2016-01-04 17:28:18 +08:00
winlin
973194c663 merge from srs2. 2015-12-31 16:02:01 +08:00
winlin
26211abf2e refine code. 2015-12-31 15:57:16 +08:00
winlin
f516636448 refine code for hooks and http core. 2015-12-29 18:33:02 +08:00
winlin
79fdc4e766 fix bug for rtmp client use NULL ptr. 2015-12-28 18:13:40 +08:00
winlin
96a4428bdb refine the http request parse. edge retry timeout. 2015-12-28 18:02:20 +08:00
winlin
86a7db0adb refine edge ingester, use upstream adapter. 2015-12-28 17:15:44 +08:00
winlin
7ae2c6bf50 merge from srs2. 2015-12-26 12:17:51 +08:00
winlin
eca46c03d2 refine code for consumer to refer the rtmp connection. 2015-12-26 12:13:17 +08:00
winlin
11e11005ac specifies the try default vhost 2015-12-24 19:14:23 +08:00
winlin
d267b8fa19 fix bug for create connection with ip. 2015-12-24 17:38:49 +08:00
winlin
a7bf4bfda5 refine code, ignore client when no ip. 2015-12-24 17:25:05 +08:00
winlin
d0c74fa7cd update 2015 to 2016 2015-12-23 11:35:40 +08:00
winlin
b881166f9a merge from srs2 2015-12-22 16:18:09 +08:00
winlin
c7850570c1 fix #546, thread terminate normally dispose bug. 2.0.203 2015-12-22 16:13:49 +08:00
winlin
e124aeb614 Merge branch '2.0release' into develop 2015-12-15 16:25:27 +08:00
winlin
69d191e53f refine the hls error log. 2015-12-15 16:25:21 +08:00
winlin
0ab64ccd2a merge from srs2. 2015-12-15 16:06:40 +08:00
winlin
40457e6cab default hls_on_error to continue. 2.0.201 2015-12-15 16:02:02 +08:00
winlin
f6ff116505 refine code, persistence use isolate method. 2015-12-15 14:27:49 +08:00
winlin
b486f6fe6b refine /api/v1/summaries, with code and server id. 2015-12-15 12:46:47 +08:00
winlin
26d328e7f2 fix bug for api, level should be string. 2015-12-14 18:43:20 +08:00
winlin
ffef3905af merge from srs2. 2015-12-11 11:35:56 +08:00
winlin
5660e24953 fast stop server. 2015-12-11 11:30:36 +08:00
winlin
2830ee12c1 fix the on_hls.ts_url bug. 2015-12-11 11:29:10 +08:00
winlin
1e4c8f8bf3 fast stop server. 2015-12-11 10:30:13 +08:00
winlin
3ab5892863 refine comments. 2015-12-10 18:02:23 +08:00
winlin
5ac8177ce6 fix bugs 2015-12-08 18:32:37 +08:00
winlin
b2ae1acaa4 copy http-parser-2.1 into srs http stack. 2015-12-07 11:35:05 +08:00
winlin
17bb31cab1 fix the config bug. 2015-12-04 15:22:13 +08:00
winlin
18eb8c81b3 merge from srs2 2015-11-16 18:10:06 +08:00
winlin
2310b2da59 fix #518, fix fd leak bug when fork. 2.0.200 2015-11-16 18:06:44 +08:00
YueHonghui
eb4ca9ff5d fix bug of fd leek in srs_app_server 2015-11-16 15:47:17 +08:00
winlin
01c46bdbfd rename org simle-rtmp-server to ossrs 2015-11-11 10:45:45 +08:00
winlin
1ffd5fd455 rename org simple-rtmp-server to ossrs 2015-11-11 10:37:50 +08:00
winlin
97f5bb8b99 merge from srs2 2015-11-05 14:48:25 +08:00
zhengfl
1dae8fc987 fix #511, fix the bug of thread stop invalid. 2015-11-05 13:52:59 +08:00
winlin
4b5eb5ea2d fix the parse rtmp url bug for ingest. 2015-11-02 13:37:44 +08:00
winlin
ec225b2108 quit child process when fork failed. 2015-11-02 11:46:33 +08:00
winlin
9d7826c681 quit child process when fork failed. 2015-11-02 11:44:22 +08:00
winlin
f57e537686 for #515, merge from srs2, use SrsAutoFreeA. 2015-11-02 11:29:20 +08:00
winlin
f4f76cd196 for #515, use SrsAutoFreeA to free the array. 2015-11-02 11:26:37 +08:00
winlin
8cec06e898 merge srs2, use srs_freepa for array 2015-11-02 11:05:39 +08:00
winlin
2af7749771 for #515, use srs_freepa to free the array. 2015-11-02 11:02:27 +08:00
winlin
cef1ae5a8e fix the config bug. 2015-10-28 12:55:16 +08:00
winlin
9ebb77d711 fix the warnings 2015-10-28 11:58:49 +08:00
winlin
e9e202dbf1 merge srs2 2015-10-28 11:51:32 +08:00
winlin
ef00005ab4 for ExoPlayer, remove duration for live. 2015-10-28 11:51:03 +08:00
winlin
59f5c5d6a5 Merge branch '2.0release' into develop 2015-10-27 18:21:04 +08:00
winlin
3b0bf1e10b for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok. 2015-10-27 18:20:57 +08:00
winlin
1d57e53910 merge from 2.0release 2015-10-27 17:45:14 +08:00
winlin
d1979c760f for #512, partical hotfix the hls pure audio. 2.0.196 2015-10-27 17:44:10 +08:00
winlin
3683f06e4d for #512, write audio frame by frame for video+audio hls. 2015-10-27 16:20:02 +08:00
winlin
b8f2ba4f0d complete kafka 2015-10-23 14:42:05 +08:00
winlin
cbe4252b4d refine code. 2015-10-23 14:42:04 +08:00
winlin
d2ca51ac50 notify kafka when client close 2015-10-23 14:42:04 +08:00
winlin
71451878c9 refine kafka, simplify code. 2015-10-23 14:42:04 +08:00
winlin
8e344f1c26 add producer api messages. 2015-10-23 14:42:04 +08:00
winlin
7a0aaf5900 kafka refine code 2015-10-23 14:42:04 +08:00
winlin
f9f5b56951 kakfa erase messages when wrote. 2015-10-23 14:42:04 +08:00
winlin
22fa9a0f1f kafka use temp transport to fetch metadata. 2015-10-23 14:42:04 +08:00
winlin
531b658f8e retry when metadata empty 2015-10-23 14:42:04 +08:00
winlin
61486a82aa kafka use topic and partition cache 2015-10-23 14:42:04 +08:00
winlin
7013993c7a kafka send the accept message. 2015-10-23 14:42:04 +08:00
winlin
de41c1c9d2 kafka refine comments. 2015-10-23 14:42:04 +08:00
winlin
31a77a83ed convert metadata to partitions 2015-10-23 14:42:04 +08:00
winlin
f0e39cc330 support show the summary of kafka metadata. 2015-10-23 14:42:04 +08:00
winlin
33a015329d add function to convert kafka array to vector 2015-10-23 14:42:03 +08:00
winlin
7106934c3a kafka producer use async interface to request metadata. 2015-10-23 14:42:03 +08:00
winlin
8974fe298b connect to kafka and send metadata request. 2015-10-23 14:42:03 +08:00
winlin
a9fdb630d9 refine code, replace all rtmp connect by simple rtmp client. 2015-10-23 14:42:02 +08:00
winlin
a08d8f83d6 refine mpegts code, use simple rtmp client 2015-10-23 14:42:02 +08:00
winlin
ad9b377d96 refine forwarder code, use simple rtmp client. 2015-10-23 14:42:02 +08:00
winlin
0f4cb8ee00 refine code, remove the rtmp recv/send macro, use one macro. 2015-10-23 14:42:02 +08:00
winlin
12e013142d refine code, use simple rtmp client. 2015-10-23 14:42:02 +08:00
winlin
bc27481886 refine code, use simple rtmp client. 2015-10-23 14:42:02 +08:00
winlin
e4c852945f refine code, support override vhost 2015-10-23 14:42:02 +08:00
winlin
a9ad7b211b refine simple rtmp client for post flv stream. 2015-10-23 14:42:02 +08:00
winlin
adb8f243bf use simple rtmp client for raw connect app 2015-10-23 14:42:02 +08:00
winlin
24b3899972 use SrsTcpClient instead raw socket. 2015-10-23 14:42:02 +08:00
winlin
a9bb6061c3 use tcp client for raw connect. 2015-10-23 14:42:02 +08:00
winlin
20fcfb3eee fix bug, use system utility 2015-10-23 14:42:02 +08:00
winlin
69cc01b696 use system utilities 2015-10-23 14:42:02 +08:00
winlin
908365a61a use string for const char* 2015-10-23 14:42:02 +08:00
winlin
d9f991ed2f use system utility for string finds 2015-10-23 14:42:02 +08:00
winlin
29122b6e70 fix #502, transcoder support snapshot. 2015-10-20 14:52:34 +08:00
winlin
9eebb89432 Merge branch '2.0release' into develop 2015-10-20 10:17:54 +08:00
winlin
91e9fc7e5b fix typo of INVLIAD to INVALID 2015-10-20 10:17:48 +08:00
winlin
ed80d9d281 merge from srs2 2015-10-04 08:10:57 +08:00
winlin
0c8209cccd fix #448, fix the bug of response of http hooks. 2.0.195 2015-10-04 08:09:39 +08:00
winlin
6587c5b2f1 merge from srs2 2015-10-01 13:22:51 +08:00
winlin
7811b4f3f7 fix #497, response error when client not found to kickoff. 2.0.194 2015-10-01 13:20:13 +08:00
winlin
d8f18aee37 use the right int type for port. 2015-09-24 18:33:07 +08:00
winlin
1c7d5f1852 Merge branch '2.0release' into develop 2015-09-24 17:55:33 +08:00
winlin
353e3260b8 remove duplicated code 2015-09-24 17:55:27 +08:00
winlin
9ead08725d use kernel utility int2str and float2str 2015-09-24 17:54:58 +08:00
winlin
6efd2dd27e add load balance round robin for brokers. 2015-09-24 17:20:04 +08:00
winlin
2a4ab8a923 add brokers to config 2015-09-24 14:53:22 +08:00
winlin
f187a7deef refine the startup logs. 2015-09-24 12:15:12 +08:00
winlin
afd6428366 refine code of server. 2015-09-23 17:21:57 +08:00
winlin
9a9483e7d5 support without kafka 2015-09-22 17:46:07 +08:00
winlin
abb5c5ad31 add kafka producer 2015-09-22 17:40:05 +08:00
winlin
b5ccc35340 add kafka config 2015-09-22 15:10:43 +08:00
winlin
df6ac8842c rename rtmp utility to protocol utility 2015-09-22 09:11:07 +08:00
winlin
82ff05c1d4 rename rtmp io to protocol io 2015-09-22 09:07:07 +08:00
winlin
168625dce2 rename rtmp amf0 to protocol amf0. 2015-09-22 09:05:21 +08:00
winlin
d32632ee8a rename SrsFastBuffer to SrsFastStream 2015-09-22 09:01:47 +08:00
winlin
4f3d2c8607 rename SrsSimpleBuffer to SrsSimpleStream 2015-09-22 08:59:52 +08:00
winlin
0e52fc6d5b rename SrsStream to SrsBuffer 2015-09-22 08:57:31 +08:00
winlin
ca3577e11b rename temp to stream 2015-09-22 08:52:00 +08:00
winlin
a4f51564db rename kernel stream to buffer 2015-09-22 08:48:55 +08:00
winlin
ac2b03a3ed rename srs_kernel_buffer to temp 2015-09-22 08:42:54 +08:00
winlin
b471c6e61c refine code, use json integter rather than number. 2015-09-19 14:40:32 +08:00
winlin
c5cd58761c move the srs thread to st. 2015-09-19 13:46:55 +08:00
winlin
3042115385 refine json to_str to dumps. 2015-09-19 13:37:56 +08:00
winlin
b59d9ba6a1 support amf0 and json to convert with each other. 2015-09-19 13:31:57 +08:00
winlin
3f7e69b617 json objects support dumps to string. 2015-09-19 12:27:31 +08:00
winlin
225e742657 add args3 2015-09-17 14:03:25 +08:00
winlin
1fd83d9314 refine the order. 2015-09-17 13:36:02 +08:00
winlin
7b2b11e932 async call worker fast execute tasks. 2015-09-17 11:57:17 +08:00
winlin
087f7740b7 fix the build failed bug 2015-09-17 11:41:23 +08:00
winlin
256459e1ec fix the utest bug 2015-09-17 11:37:35 +08:00
winlin
8a90e76637 fix #459, support dvr raw api. 3.0.4 2015-09-15 23:00:00 +08:00
winlin
2a1b2b69a0 for #459, dvr support apply filter for ng-control dvr module. 2015-09-15 15:58:57 +08:00
winlin
8f9cfcdcf4 fix #319, http raw api support update global and vhost. 3.0.4 2015-09-15 13:03:18 +08:00
winlin
e8a00de4a3 for #319, support enable or disable vhost. 2015-09-15 12:51:14 +08:00
winlin
631e76cd32 for #319, support update and delete the disabled vhost 2015-09-15 12:15:18 +08:00
winlin
a7c4b786cf merge from 2.0 2015-09-14 18:42:31 +08:00
winlin
511627abab fix #474, config to donot parse width/height from sps. 2.0.189 2015-09-14 18:36:44 +08:00
winlin
eb578b4a39 refine the thread, set to disposed when terminate normally 2015-09-14 17:17:38 +08:00
winlin
83a9ff9f5d for #474, refine the hls publish, donot fetch from source when publish 2015-09-14 15:49:25 +08:00
winlin
44bcb4045f for #474, decode the sequence header before hls. 2015-09-14 15:32:09 +08:00
winlin
07ef8160a3 clear the queue when edge republish. 2015-09-14 15:25:01 +08:00
winlin
704624c9ec clear the queue when edge republish. 2015-09-14 15:19:49 +08:00
winlin
8be3c875af donot release stream when busy 2015-09-14 15:17:59 +08:00
winlin
3da25f3aee when thread terminated normally, set the tid to NULL. 2015-09-14 15:11:49 +08:00
winlin
a994191ddc for #474, always release publish for source. 2015-09-14 15:10:34 +08:00
winlin
eb9aa47ab1 merge from 2.0 2015-09-14 13:48:27 +08:00
winlin
0d57ef9373 fix #458, http hooks use source thread cid. 2.0.188 2015-09-14 13:47:25 +08:00
winlin
3b483094bd merge from 2.0 2015-09-14 12:24:57 +08:00
winlin
6d50aa1aa2 #475, fix http hooks crash for st context switch. 2.0.187 2015-09-14 12:22:19 +08:00
winlin
adb74dc74e Merge branch '2.0release' into develop 2015-09-14 11:17:19 +08:00
winlin
f0fc093b19 fix the http zero content length bug. 2015-09-14 11:17:04 +08:00
winlin
01308ecc98 for #319, support initialize the parser to whether use jsonp 2015-09-12 22:22:33 +08:00
winlin
491ec11833 for #319, raw api support add new vhost 2015-09-12 21:55:53 +08:00
winlin
a88f321d8b for #319, merge from 2.0release 2015-09-09 23:41:11 +08:00
winlin
abd7ee227c support reload utc_time. 2.0.186 2015-09-09 23:37:07 +08:00
winlin
c4feb8f6ed for #319, raw api support update all globals. 2015-09-09 23:32:02 +08:00
winlin
6aafd072db for #319, raw api support update srs log tank, level and file. 2015-09-09 22:44:34 +08:00
winlin
8107e5f9a6 for #319, raw api support set the ff_log_dir 2015-09-09 21:46:29 +08:00
winlin
c8466c36bd for #319, raw api support update the global RTMP chunk_size. 2015-09-01 21:27:04 +08:00
winlin
2bdd974227 for #319, reorder the ingesters. 2015-09-01 18:41:30 +08:00
winlin
342483bf04 for #319, when reload the listen, restart all ingesters. 2015-09-01 18:39:14 +08:00
winlin
310b5a14cb for #319, support minimal query api 2015-09-01 13:33:49 +08:00
winlin
06c7ae62ee for #319, refine the error code for RAW APi. 2015-09-01 12:27:53 +08:00
winlin
11c409688b for #319, http raw api support query. 3.0.3 2015-08-31 23:34:03 +08:00
winlin
8a2709dd2c for #319, do not apply when config not changed. 2015-08-31 12:06:22 +08:00
winlin
a62c82bd46 for #319, api raw update global.listen 2015-08-30 23:42:21 +08:00
winlin
364460f2ab for #319, support raw update global.listen 2015-08-30 23:18:14 +08:00
winlin
f8d8c3ace4 use function to dumps the engine. 2015-08-30 23:08:27 +08:00