Merge branch '2.0release' into 2.0+

胡斌 · 胡斌
Commit 6bf24238a6c6f0d11eb1082156b56a92e87141f1 6bf24238 2 parents a4de7115 3903d2a8
README.md
trunk/.gitignore
trunk/conf/bandwidth.conf
trunk/conf/dvr.path.conf
trunk/conf/dvr.segment.conf
trunk/conf/dvr.session.conf
trunk/conf/edge.conf
trunk/conf/edge.token.traverse.conf
trunk/conf/ffmpeg.transcode.conf
trunk/conf/forward.master.conf
trunk/conf/forward.slave.conf
trunk/conf/hds.conf
trunk/conf/hls.conf
trunk/conf/http.aac.live.conf
trunk/conf/http.flv.live.conf
trunk/conf/http.flv.live.edge1.conf
trunk/conf/http.flv.live.edge2.conf
trunk/conf/http.heartbeat.conf
trunk/conf/http.hls.conf
trunk/conf/http.hooks.callback.conf
--- a/README.md
查看文件 @6bf2423
+++ b/README.md
查看文件 @6bf2423
@@ -2,13 +2,10 @@
 [![CircleCI](https://circleci.com/gh/ossrs/srs/tree/2.0release.svg?style=svg)](https://circleci.com/gh/ossrs/srs/tree/2.0release)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ossrs/srs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Wechat](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat)
 SRS/2.0, [ZhouGuowen][release2]
-[![Donation](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_92x26.png)](http://www.ossrs.net/srs.release/donation/index.html)
-[![Paypal](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_pp_142x27.png)](http://www.ossrs.net/srs.release/donation/paypal.html)
-[![LinkedIn](http://s.c.lnkd.licdn.com/scds/common/u/img/webpromo/btn_liprofile_blue_80x15.png)](http://cn.linkedin.com/in/winlinvip)
-
 SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。<br/>
 SRS is industrial-strength live streaming cluster, for the best conceptual integrity and the simplest implementation. 
@@ -150,14 +147,6 @@ Please select your language:
 * [SRS 2.0 English][v2_EN_Home]
 * [SRS 2.0 Chinese][v2_CN_Home]
-## Donation
-
-Donation:<br/>
-[http://www.ossrs.net/srs.release/donation/index.html][donation1]
-
-Donations:<br/>
-[https://github.com/ossrs/srs/blob/develop/DONATIONS.txt][donations]
-
 ## System Requirements
 Supported operating systems and hardware:
 * All Linux , both 32 and 64 bits
@@ -170,32 +159,32 @@ Supported operating systems and hardware:
 1. High-performance([CN][v1_CN_Performance], [EN][v1_EN_Performance]): single-thread, async socket, event/st-thread driven.
 1. High-concurrency([CN][v1_CN_Performance], [EN][v1_EN_Performance]), 6000+ connections(500kbps), 900Mbps, CPU 90.2%, 41MB
 1. Support RTMP Origin Server([CN][v1_CN_DeliveryRTMP],[EN][v1_EN_DeliveryRTMP])
-1. Support RTMP Edge Server([CN][v1_CN_Edge], [EN][v1_EN_Edge]) for CDN, push/pull stream from any RTMP server
+1. Support RTMP Edge Server([CN][v2_CN_Edge], [EN][v2_EN_Edge]) for CDN, push/pull stream from any RTMP server
 1. Support single process; no multiple processes.
 1. Support Vhost([CN][v1_CN_RtmpUrlVhost], [EN][v1_EN_RtmpUrlVhost]), support \_\_defaultVhost\_\_.
 1. Support RTMP([CN][v1_CN_DeliveryRTMP], [EN][v1_EN_DeliveryRTMP]) live streaming; no vod streaming.
-1. Support Apple HLS(m3u8)([CN][v1_CN_DeliveryHLS], [EN][v1_EN_DeliveryHLS]) live streaming.
-1. Support HLS audio-only([CN][v1_CN_DeliveryHLS2], [EN][v1_EN_DeliveryHLS2]) live streaming.
+1. Support Apple HLS(m3u8)([CN][v2_CN_DeliveryHLS], [EN][v2_EN_DeliveryHLS]) live streaming.
+1. Support HLS audio-only([CN][v2_CN_DeliveryHLS2], [EN][v2_EN_DeliveryHLS2]) live streaming.
 1. Support Reload([CN][v1_CN_Reload], [EN][v1_EN_Reload]) config to enable changes.
-1. Support cache last gop([CN][v1_CN_LowLatency2], [EN][v1_EN_LowLatency2]) for flash player to fast startup.
+1. Support cache last gop([CN][v2_CN_LowLatency2], [EN][v2_EN_LowLatency2]) for flash player to fast startup.
 1. Support listen at multiple ports.
 1. Support long time(>4.6hours) publish/play.
 1. Support Forward([CN][v1_CN_Forward], [EN][v1_EN_Forward]) in master-slave mode.
-1. Support live stream Transcoding([CN][v1_CN_FFMPEG], [EN][v1_EN_FFMPEG]) by ffmpeg.
-1. Support ffmpeg([CN][v1_CN_FFMPEG], [EN][v1_EN_FFMPEG]) filters(logo/overlay/crop), x264 params, copy/vn/an.
-1. Support audio transcode([CN][v1_CN_FFMPEG], [EN][v1_EN_FFMPEG]) only, speex/mp3 to aac
-1. Support http callback api hooks([CN][v1_CN_HTTPCallback], [EN][v1_EN_HTTPCallback])(for authentication and injection).
+1. Support live stream Transcoding([CN][v2_CN_FFMPEG], [EN][v2_EN_FFMPEG]) by ffmpeg.
+1. Support ffmpeg([CN][v2_CN_FFMPEG], [EN][v2_EN_FFMPEG]) filters(logo/overlay/crop), x264 params, copy/vn/an.
+1. Support audio transcode([CN][v2_CN_FFMPEG], [EN][v2_EN_FFMPEG]) only, speex/mp3 to aac
+1. Support http callback api hooks([CN][v2_CN_HTTPCallback], [EN][v2_EN_HTTPCallback])(for authentication and injection).
 1. Support bandwidth test([CN][v1_CN_BandwidthTestTool], [EN][v1_EN_BandwidthTestTool]) api and flash client.
 1. Player, publisher(encoder), and demo pages(jquery+bootstrap)([CN][v1_CN_SampleDemo],[EN][v1_EN_SampleDemo]). 
 1. Demo([CN][v1_CN_SampleDemo], [EN][v1_EN_SampleDemo]) video meeting or chat(SRS+cherrypy+jquery+bootstrap). 
-1. Full documents in wiki([CN][v1_CN_Home], [EN][v1_EN_Home]), both Chinese and English. 
+1. Full documents in wiki([CN][v2_CN_Home], [EN][v2_EN_Home]), both Chinese and English. 
 1. Support RTMP(play-publish) library: srs-librtmp([CN][v2_CN_SrsLibrtmp], [EN][v2_EN_SrsLibrtmp])
 1. Support ARM cpu arch([CN][v1_CN_SrsLinuxArm], [EN][v1_EN_SrsLinuxArm]) with rtmp/ssl/hls/librtmp.
 1. Support init.d([CN][v1_CN_LinuxService], [EN][v1_EN_LinuxService]) and packge script, log to file. 
 1. Support RTMP ATC([CN][v1_CN_RTMP-ATC], [EN][v1_EN_RTMP-ATC]) for HLS/HDS to support backup(failover)
-1. Support HTTP RESTful management api([CN][v1_CN_HTTPApi], [EN][v1_EN_HTTPApi]).
+1. Support HTTP RESTful management api([CN][v2_CN_HTTPApi], [EN][v2_EN_HTTPApi]).
 1. Support Ingest([CN][v1_CN_Ingest], [EN][v1_EN_Ingest]) FILE/HTTP/RTMP/RTSP(RTP, SDP) to RTMP using external tools(e.g ffmepg).
-1. Support DVR([CN][v1_CN_DVR], [EN][v1_EN_DVR]), record live to flv file for vod.
+1. Support DVR([CN][v2_CN_DVR], [EN][v2_EN_DVR]), record live to flv file for vod.
 1. Support tracable log, session based log([CN][v1_CN_SrsLog], [EN][v1_EN_SrsLog]).
 1. Support DRM token traverse([CN][v1_CN_DRM2], [EN][v1_EN_DRM2]) for fms origin authenticate.
 1. Support system full utest on gtest.
@@ -204,7 +193,7 @@ Supported operating systems and hardware:
 1. Stable [1.0release branch][branch1].
 1. Support publish h264 raw stream([CN][v2_CN_SrsLibrtmp2], [EN][v2_EN_SrsLibrtmp2]) by srs-librtmp.
 1. Support [6k+ clients][bug #194], 3Gbps per process.
-1. Suppport [English wiki][v1_EN_Home].
+1. Suppport [English wiki][v2_EN_Home].
 1. Research and simplify st, [bug #182][bug #182].
 1. Support compile [srs-librtmp on windows][srs-librtmp], [bug #213][bug #213].
 1. Support [10k+ clients][bug #251], 4Gbps per process.
@@ -216,7 +205,7 @@ Supported operating systems and hardware:
 1. Support HLS(h.264+mp3) streaming, read [bug #301][bug #301].
 1. Rewrite HLS(h.264+aac/mp3) streaming, read [bug #304][bug #304].
 1. [dev] Realease [2.0release branch][branch2].
-1. [experiment] Support Adobe HDS(f4m)([CN][v1_CN_DeliveryHDS], [EN][v1_EN_DeliveryHDS]) dynamic streaming.
+1. [experiment] Support Adobe HDS(f4m)([CN][v2_CN_DeliveryHDS], [EN][v2_EN_DeliveryHDS]) dynamic streaming.
 1. [experiment] Support push MPEG-TS over UDP to SRS, read [bug #250][bug #250].
 1. [experiment] Support push RTSP to SRS, read [bug #133][bug #133].
 1. [experiment] Support push flv stream over HTTP POST to SRS, read [wiki]([CN][v2_CN_Streamer2], [EN][v2_EN_Streamer2]).
@@ -331,13 +320,13 @@ Remark:
 * 2014-06-27, [Release v0.9.5][r1.0a5], refine perf 3k+ clients, edge token traverse, [srs monitor](http://ossrs.net:1977), 30days online. 41573 lines.
 * 2014-05-28, [Release v0.9.4][r1.0a4], support heartbeat, tracable log, fix mem leak and bugs. 39200 lines.
 * 2014-05-18, [Release v0.9.3][r1.0a3], support mips, fms origin, json(http-api). 37594 lines.
-* 2014-04-28, [Release v0.9.2][r1.0a2], support [dvr][v1_CN_DVR], android, [edge][v1_CN_Edge]. 35255 lines.
-* 2014-04-07, [Release v0.9.1][r1.0a0], support [arm][v1_CN_SrsLinuxArm], [init.d][v1_CN_LinuxService], http [server][v1_CN_HTTPServer]/[api][v1_CN_HTTPApi], [ingest][v1_CN_SampleIngest]. 30000 lines.
+* 2014-04-28, [Release v0.9.2][r1.0a2], support [dvr][v2_CN_DVR], android, [edge][v2_CN_Edge]. 35255 lines.
+* 2014-04-07, [Release v0.9.1][r1.0a0], support [arm][v1_CN_SrsLinuxArm], [init.d][v1_CN_LinuxService], http [server][v2_CN_HTTPServer]/[api][v2_CN_HTTPApi], [ingest][v1_CN_SampleIngest]. 30000 lines.
 * 2013-12-25, [Release v0.9.0][r0.9], support bandwidth test, player/encoder/chat [demos][v1_CN_SampleDemo]. 20926 lines.
-* 2013-12-08, [Release v0.8.0][r0.8], support [http hooks callback][v1_CN_HTTPCallback], update [SB][srs-bench]. 19186 lines.
-* 2013-12-03, [Release v0.7.0][r0.7], support [live stream transcoding][v1_CN_FFMPEG]. 17605 lines.
+* 2013-12-08, [Release v0.8.0][r0.8], support [http hooks callback][v2_CN_HTTPCallback], update [SB][srs-bench]. 19186 lines.
+* 2013-12-03, [Release v0.7.0][r0.7], support [live stream transcoding][v2_CN_FFMPEG]. 17605 lines.
 * 2013-11-29, [Release v0.6.0][r0.6], support [forward][v1_CN_Forward] stream to origin/edge. 16094 lines.
-* 2013-11-26, [Release v0.5.0][r0.5], support [HLS(m3u8)][v1_CN_DeliveryHLS], fragment and window. 14449 lines.
+* 2013-11-26, [Release v0.5.0][r0.5], support [HLS(m3u8)][v2_CN_DeliveryHLS], fragment and window. 14449 lines.
 * 2013-11-10, [Release v0.4.0][r0.4], support [reload][v1_CN_Reload] config, pause, longtime publish/play. 12500 lines.
 * 2013-11-04, [Release v0.3.0][r0.3], support [vhost][v1_CN_RtmpUrlVhost], refer, gop cache, listen multiple ports. 11773 lines.
 * 2013-10-25, [Release v0.2.0][r0.2], support [rtmp][v1_CN_RTMPHandshake] flash publish, h264, time jitter correct. 10125 lines.
@@ -346,6 +335,8 @@ Remark:
 ## History
+* v2.0, 2017-02-25, for [#730][bug #730], remove the test code. 2.0.234
+* v2.0, 2017-02-09, fix [#503][bug #503] disable utilities when reload a source. 2.0.233
 * v2.0, 2017-01-22, for [#752][bug #752] release the io then free it for kbps. 2.0.232
 * v2.0, 2017-01-18, fix [#750][bug #750] use specific error code for dns resolve. 2.0.231
 * <strong>v2.0, 2017-01-18, [2.0 beta4(2.0.230)][r2.0b4] released. 86334 lines.</strong>
@@ -630,7 +621,7 @@ Remark:
 * v1.0, 2014-04-10, support reload ingesters(add/remov/update). 0.9.57
 * <strong>v1.0, 2014-04-07, [1.0 mainline(0.9.55)][r1.0a0] released. 30000 lines.</strong>
 * v1.0, 2014-04-07, support [ingest][v1_CN_SampleIngest] file/stream/device.
-* v1.0, 2014-04-05, support [http api][v1_CN_HTTPApi] and [http server][v1_CN_HTTPServer].
+* v1.0, 2014-04-05, support [http api][v2_CN_HTTPApi] and [http server][v2_CN_HTTPServer].
 * v1.0, 2014-04-03, implements http framework and api/v1/version.
 * v1.0, 2014-03-30, fix bug for st detecting epoll failed, force st to use epoll.
 * v1.0, 2014-03-29, add wiki [Performance for RaspberryPi][v1_CN_RaspberryPi].
@@ -648,16 +639,16 @@ Remark:
 * v1.0, 2014-03-12, finish utest for amf0 codec.
 * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile.
 * v1.0, 2014-03-04, add gest framework for utest, build success.
-* v1.0, 2014-03-02, add wiki [srs-librtmp][v1_CN_SrsLibrtmp], [SRS for arm][v1_CN_SrsLinuxArm], [product][v1_CN_Product]
+* v1.0, 2014-03-02, add wiki [srs-librtmp][v2_CN_SrsLibrtmp], [SRS for arm][v1_CN_SrsLinuxArm], [product][v1_CN_Product]
 * v1.0, 2014-03-02, srs-librtmp, client publish/play library like librtmp.
 * v1.0, 2014-03-01, modularity, extract core/kernel/rtmp/app/main module.
 * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package.
-* v1.0, 2014-02-28, add wiki [BuildArm][v1_CN_Build], [FFMPEG][v1_CN_FFMPEG], [Reload][v1_CN_Reload]
-* v1.0, 2014-02-27, add wiki [LowLatency][v1_CN_LowLatency], [HTTPCallback][v1_CN_HTTPCallback], [ServerSideScript][v1_CN_ServerSideScript], [IDE][v1_CN_IDE]
-* v1.0, 2014-01-19, add wiki [DeliveryHLS][v1_CN_DeliveryHLS]
+* v1.0, 2014-02-28, add wiki [BuildArm][v2_CN_Build], [FFMPEG][v2_CN_FFMPEG], [Reload][v1_CN_Reload]
+* v1.0, 2014-02-27, add wiki [LowLatency][v2_CN_LowLatency], [HTTPCallback][v2_CN_HTTPCallback], [ServerSideScript][v1_CN_ServerSideScript], [IDE][v2_CN_IDE]
+* v1.0, 2014-01-19, add wiki [DeliveryHLS][v2_CN_DeliveryHLS]
 * v1.0, 2014-01-12, add wiki [HowToAskQuestion][v1_CN_HowToAskQuestion], [RtmpUrlVhost][v1_CN_RtmpUrlVhost]
 * v1.0, 2014-01-11, fix jw/flower player pause bug, which send closeStream actually.
-* v1.0, 2014-01-05, add wiki [Build][v1_CN_Build], [Performance][v1_CN_Performance], [Forward][v1_CN_Forward]
+* v1.0, 2014-01-05, add wiki [Build][v2_CN_Build], [Performance][v1_CN_Performance], [Forward][v1_CN_Forward]
 * v1.0, 2014-01-01, change listen(512), chunk-size(60000), to improve performance.
 * v1.0, 2013-12-27, merge from wenjie, the bandwidth test feature.
 * <strong>v0.9, 2013-12-25, [v0.9][r0.9] released. 20926 lines.</strong>
@@ -675,7 +666,7 @@ Remark:
 * v0.9, 2013-12-14, refine the thread model for the retry threads.
 * v0.9, 2013-12-10, auto install depends tools/libs on centos/ubuntu.
 * <strong>v0.8, 2013-12-08, [v0.8][r0.8] released. 19186 lines.</strong>
-* v0.8, 2013-12-08, support [http hooks][v1_CN_HTTPCallback]: on_connect/close/publish/unpublish/play/stop.
+* v0.8, 2013-12-08, support [http hooks][v2_CN_HTTPCallback]: on_connect/close/publish/unpublish/play/stop.
 * v0.8, 2013-12-08, support multiple http hooks for a event.
 * v0.8, 2013-12-07, support http callback hooks, on_connect.
 * v0.8, 2013-12-07, support network based cli and json result, add CherryPy 3.2.4.
@@ -976,8 +967,8 @@ Winlin
 [v1_EN_SampleARM]: https://github.com/ossrs/srs/wiki/v1_EN_SampleARM
 [v1_CN_SampleIngest]: https://github.com/ossrs/srs/wiki/v1_CN_SampleIngest
 [v1_EN_SampleIngest]: https://github.com/ossrs/srs/wiki/v1_EN_SampleIngest
-[v1_CN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v1_CN_SampleHTTP
-[v1_EN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v1_EN_SampleHTTP
+[v2_CN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v2_CN_SampleHTTP
+[v2_EN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v2_EN_SampleHTTP
 [v1_CN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo
 [v1_EN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_EN_SampleDemo
 [v2_CN_SrsLibrtmp2]: https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data
@@ -1000,28 +991,28 @@ Winlin
 [v1_EN_Performance]: https://github.com/ossrs/srs/wiki/v1_EN_Performance
 [v1_CN_DeliveryRTMP]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryRTMP
 [v1_EN_DeliveryRTMP]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryRTMP
-[v1_CN_Edge]: https://github.com/ossrs/srs/wiki/v1_CN_Edge
-[v1_EN_Edge]: https://github.com/ossrs/srs/wiki/v1_EN_Edge
+[v2_CN_Edge]: https://github.com/ossrs/srs/wiki/v2_CN_Edge
+[v2_EN_Edge]: https://github.com/ossrs/srs/wiki/v2_EN_Edge
 [v1_CN_RtmpUrlVhost]: https://github.com/ossrs/srs/wiki/v1_CN_RtmpUrlVhost
 [v1_EN_RtmpUrlVhost]: https://github.com/ossrs/srs/wiki/v1_EN_RtmpUrlVhost
 [v1_CN_RTMPHandshake]: https://github.com/ossrs/srs/wiki/v1_CN_RTMPHandshake
 [v1_EN_RTMPHandshake]: https://github.com/ossrs/srs/wiki/v1_EN_RTMPHandshake
-[v1_CN_HTTPServer]: https://github.com/ossrs/srs/wiki/v1_CN_HTTPServer
-[v1_EN_HTTPServer]: https://github.com/ossrs/srs/wiki/v1_EN_HTTPServer
-[v1_CN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHLS
-[v1_EN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHLS
-[v1_CN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHLS#hlsaudioonly
-[v1_EN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHLS#hlsaudioonly
+[v2_CN_HTTPServer]: https://github.com/ossrs/srs/wiki/v2_CN_HTTPServer
+[v2_EN_HTTPServer]: https://github.com/ossrs/srs/wiki/v2_EN_HTTPServer
+[v2_CN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS
+[v2_EN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHLS
+[v2_CN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS#hlsaudioonly
+[v2_EN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHLS#hlsaudioonly
 [v1_CN_Reload]: https://github.com/ossrs/srs/wiki/v1_CN_Reload
 [v1_EN_Reload]: https://github.com/ossrs/srs/wiki/v1_EN_Reload
-[v1_CN_LowLatency2]: https://github.com/ossrs/srs/wiki/v1_CN_LowLatency#gop-cache
-[v1_EN_LowLatency2]: https://github.com/ossrs/srs/wiki/v1_EN_LowLatency#gop-cache
+[v2_CN_LowLatency2]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency#gop-cache
+[v2_EN_LowLatency2]: https://github.com/ossrs/srs/wiki/v2_EN_LowLatency#gop-cache
 [v1_CN_Forward]: https://github.com/ossrs/srs/wiki/v1_CN_Forward
 [v1_EN_Forward]: https://github.com/ossrs/srs/wiki/v1_EN_Forward
-[v1_CN_FFMPEG]: https://github.com/ossrs/srs/wiki/v1_CN_FFMPEG
-[v1_EN_FFMPEG]: https://github.com/ossrs/srs/wiki/v1_EN_FFMPEG
-[v1_CN_HTTPCallback]: https://github.com/ossrs/srs/wiki/v1_CN_HTTPCallback
-[v1_EN_HTTPCallback]: https://github.com/ossrs/srs/wiki/v1_EN_HTTPCallback
+[v2_CN_FFMPEG]: https://github.com/ossrs/srs/wiki/v2_CN_FFMPEG
+[v2_EN_FFMPEG]: https://github.com/ossrs/srs/wiki/v2_EN_FFMPEG
+[v2_CN_HTTPCallback]: https://github.com/ossrs/srs/wiki/v2_CN_HTTPCallback
+[v2_EN_HTTPCallback]: https://github.com/ossrs/srs/wiki/v2_EN_HTTPCallback
 [v1_CN_BandwidthTestTool]: https://github.com/ossrs/srs/wiki/v1_CN_BandwidthTestTool
 [v1_EN_BandwidthTestTool]: https://github.com/ossrs/srs/wiki/v1_EN_BandwidthTestTool
 [v1_CN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo
@@ -1034,12 +1025,12 @@ Winlin
 [v1_EN_LinuxService]: https://github.com/ossrs/srs/wiki/v1_EN_LinuxService
 [v1_CN_RTMP-ATC]: https://github.com/ossrs/srs/wiki/v1_CN_RTMP-ATC
 [v1_EN_RTMP-ATC]: https://github.com/ossrs/srs/wiki/v1_EN_RTMP-ATC
-[v1_CN_HTTPApi]: https://github.com/ossrs/srs/wiki/v1_CN_HTTPApi
-[v1_EN_HTTPApi]: https://github.com/ossrs/srs/wiki/v1_EN_HTTPApi
+[v2_CN_HTTPApi]: https://github.com/ossrs/srs/wiki/v2_CN_HTTPApi
+[v2_EN_HTTPApi]: https://github.com/ossrs/srs/wiki/v2_EN_HTTPApi
 [v1_CN_Ingest]: https://github.com/ossrs/srs/wiki/v1_CN_Ingest
 [v1_EN_Ingest]: https://github.com/ossrs/srs/wiki/v1_EN_Ingest
-[v1_CN_DVR]: https://github.com/ossrs/srs/wiki/v1_CN_DVR
-[v1_EN_DVR]: https://github.com/ossrs/srs/wiki/v1_EN_DVR
+[v2_CN_DVR]: https://github.com/ossrs/srs/wiki/v2_CN_DVR
+[v2_EN_DVR]: https://github.com/ossrs/srs/wiki/v2_EN_DVR
 [v1_CN_SrsLog]: https://github.com/ossrs/srs/wiki/v1_CN_SrsLog
 [v1_EN_SrsLog]: https://github.com/ossrs/srs/wiki/v1_EN_SrsLog
 [v1_CN_DRM2]: https://github.com/ossrs/srs/wiki/v1_CN_DRM#tokentraverse
@@ -1056,8 +1047,8 @@ Winlin
 [v2_EN_Security]: https://github.com/ossrs/srs/wiki/v2_EN_Security
 [v2_CN_DeliveryHttpStream]: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHttpStream
 [v2_EN_DeliveryHttpStream]: https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHttpStream
-[v1_CN_DeliveryHDS]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHDS
-[v1_EN_DeliveryHDS]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHDS
+[v2_CN_DeliveryHDS]: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHDS
+[v2_EN_DeliveryHDS]: https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHDS
 [v2_CN_Streamer2]: https://github.com/ossrs/srs/wiki/v2_CN_Streamer#push-http-flv-to-srs
 [v2_EN_Streamer2]: https://github.com/ossrs/srs/wiki/v2_EN_Streamer#push-http-flv-to-srs
 [v2_CN_SampleHttpFlv]: https://github.com/ossrs/srs/wiki/v2_CN_SampleHttpFlv
@@ -1070,18 +1061,18 @@ Winlin
 [v1_CN_Performance#performancereport4k]: https://github.com/ossrs/srs/wiki/v1_CN_Performance#performancereport4k
 [v1_CN_DRM#tokentraverse]: https://github.com/ossrs/srs/wiki/v1_CN_DRM#tokentraverse
 [v1_CN_RaspberryPi]: https://github.com/ossrs/srs/wiki/v1_CN_RaspberryPi
-[v1_CN_SrsLibrtmp]: https://github.com/ossrs/srs/wiki/v1_CN_SrsLibrtmp
-[v1_CN_Build]: https://github.com/ossrs/srs/wiki/v1_CN_Build
-[v1_CN_LowLatency]: https://github.com/ossrs/srs/wiki/v1_CN_LowLatency
+[v2_CN_SrsLibrtmp]: https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp
+[v2_CN_Build]: https://github.com/ossrs/srs/wiki/v2_CN_Build
+[v2_CN_LowLatency]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency
 [v1_CN_HowToAskQuestion]: https://github.com/ossrs/srs/wiki/v1_CN_HowToAskQuestion
-[v1_CN_Build]: https://github.com/ossrs/srs/wiki/v1_CN_Build
+[v2_CN_Build]: https://github.com/ossrs/srs/wiki/v2_CN_Build
 [v1_CN_Performance]: https://github.com/ossrs/srs/wiki/v1_CN_Performance
 [v1_CN_RaspberryPi]: https://github.com/ossrs/srs/wiki/v1_CN_RaspberryPi
 [v2_CN_LowLatency#merged-read]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency#merged-read
 [v1_CN_Product]: https://github.com/ossrs/srs/wiki/v1_CN_Product
 [v1_CN_ServerSideScript]: https://github.com/ossrs/srs/wiki/v1_CN_ServerSideScript
 [v2_EN_LowLatency#merged-write]: https://github.com/ossrs/srs/wiki/v2_EN_LowLatency#merged-write
-[v1_CN_IDE]: https://github.com/ossrs/srs/wiki/v1_CN_IDE
+[v2_CN_IDE]: https://github.com/ossrs/srs/wiki/v2_CN_IDE
 [v2_CN_LowLatency#merged-write]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency#merged-write
 [bug #213]: https://github.com/ossrs/srs/issues/213
@@ -1285,6 +1276,7 @@ Winlin
 [bug #749]: https://github.com/ossrs/srs/issues/749
 [bug #750]: https://github.com/ossrs/srs/issues/750
 [bug #752]: https://github.com/ossrs/srs/issues/752
+[bug #503]: https://github.com/ossrs/srs/issues/503
 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
 [exo #828]: https://github.com/google/ExoPlayer/pull/828
--- a/trunk/.gitignore 0 → 100644
查看文件 @6bf2423
+++ b/trunk/.gitignore 0 → 100644
查看文件 @6bf2423
+/*.conf
+/doc/frozen*
+/doc/kungfupanda*
+/doc/time*
+/html
+/ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcshareddata/
+/ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcuserdata/
+/ide/srs_xcode/srs_xcode.xcodeproj/xcuserdata/
+/research/aac/
+/research/api-server/.idea/
+/research/api-server/static-dir/mse
+/research/bat/
+/research/big/
+/research/bitch/
+/research/bott/
+/research/cgo/
+/research/dns/
+/research/empty/
+/research/golang/
+/research/librtmp/*.mp4
+/research/licenser/
+/research/players/.idea/
+/research/players/fls_player/
+/research/players/mic/
+/research/players/srs_player/.idea/
+/research/proxy/
+/research/redis-ocluster/
+/research/rtmfp/
+/research/snap/
+/research/speex/
+/test/
+
--- a/trunk/conf/bandwidth.conf
查看文件 @6bf2423
+++ b/trunk/conf/bandwidth.conf
查看文件 @6bf2423
@@ -3,6 +3,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
 }
--- a/trunk/conf/dvr.path.conf
查看文件 @6bf2423
+++ b/trunk/conf/dvr.path.conf
查看文件 @6bf2423
@@ -5,6 +5,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     dvr {
         enabled             on;
--- a/trunk/conf/dvr.segment.conf
查看文件 @6bf2423
+++ b/trunk/conf/dvr.segment.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     dvr {
         enabled      on;
--- a/trunk/conf/dvr.session.conf
查看文件 @6bf2423
+++ b/trunk/conf/dvr.session.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     dvr {
         enabled      on;
--- a/trunk/conf/edge.conf
查看文件 @6bf2423
+++ b/trunk/conf/edge.conf
查看文件 @6bf2423
@@ -5,7 +5,8 @@
 listen              1935;
 max_connections     1000;
 pid                 objs/edge.pid;
-srs_log_file        ./objs/edge.log;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     mode            remote;
     origin          127.0.0.1:19350;
--- a/trunk/conf/edge.token.traverse.conf
查看文件 @6bf2423
+++ b/trunk/conf/edge.token.traverse.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     mode            remote;
     origin          127.0.0.1:19350;
--- a/trunk/conf/ffmpeg.transcode.conf
查看文件 @6bf2423
+++ b/trunk/conf/ffmpeg.transcode.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     transcode {
         enabled     on;
--- a/trunk/conf/forward.master.conf
查看文件 @6bf2423
+++ b/trunk/conf/forward.master.conf
查看文件 @6bf2423
@@ -5,8 +5,8 @@
 listen              1935;
 max_connections     1000;
 pid                 ./objs/srs.master.pid;
-srs_log_tank        file;
-srs_log_file        ./objs/srs.master.log;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     forward         127.0.0.1:19350;
 }
--- a/trunk/conf/forward.slave.conf
查看文件 @6bf2423
+++ b/trunk/conf/forward.slave.conf
查看文件 @6bf2423
@@ -5,7 +5,7 @@
 listen              19350;
 max_connections     1000;
 pid                 ./objs/srs.slave.pid;
-srs_log_tank        file;
-srs_log_file        ./objs/srs.slave.log;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
 }
--- a/trunk/conf/hds.conf
查看文件 @6bf2423
+++ b/trunk/conf/hds.conf
查看文件 @6bf2423
@@ -4,10 +4,8 @@
 listen              1935;
 max_connections     1000;
-
 daemon              off;
 srs_log_tank        console;
-srs_log_level       trace;
 vhost __defaultVhost__ {
     hds {
--- a/trunk/conf/hls.conf
查看文件 @6bf2423
+++ b/trunk/conf/hls.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     hls {
         enabled         on;
--- a/trunk/conf/http.aac.live.conf
查看文件 @6bf2423
+++ b/trunk/conf/http.aac.live.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8080;
--- a/trunk/conf/http.flv.live.conf
查看文件 @6bf2423
+++ b/trunk/conf/http.flv.live.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8080;
--- a/trunk/conf/http.flv.live.edge1.conf
查看文件 @6bf2423
+++ b/trunk/conf/http.flv.live.edge1.conf
查看文件 @6bf2423
@@ -5,7 +5,8 @@
 listen              19351;
 max_connections     1000;
 pid                 objs/srs.flv.19351.pid;
-srs_log_file        objs/srs.flv.19351.log;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8081;
--- a/trunk/conf/http.flv.live.edge2.conf
查看文件 @6bf2423
+++ b/trunk/conf/http.flv.live.edge2.conf
查看文件 @6bf2423
@@ -5,7 +5,8 @@
 listen              19352;
 max_connections     1000;
 pid                 objs/srs.flv.19352.pid;
-srs_log_file        objs/srs.flv.19352.log;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8082;
--- a/trunk/conf/http.heartbeat.conf
查看文件 @6bf2423
+++ b/trunk/conf/http.heartbeat.conf
查看文件 @6bf2423
@@ -3,6 +3,8 @@
 listen              1935
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 heartbeat {
     enabled         on;
     interval        9.3;
--- a/trunk/conf/http.hls.conf
查看文件 @6bf2423
+++ b/trunk/conf/http.hls.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8080;
--- a/trunk/conf/http.hooks.callback.conf
查看文件 @6bf2423
+++ b/trunk/conf/http.hooks.callback.conf
查看文件 @6bf2423
@@ -3,8 +3,8 @@
 listen              1935;
 max_connections     1000;
-srs_log_tank        file;
-srs_log_file        ./objs/srs.log;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     http_hooks {
         enabled         on;
--- a/trunk/conf/http.mp3.live.conf
查看文件 @6bf2423
+++ b/trunk/conf/http.mp3.live.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8080;
--- a/trunk/conf/http.server.conf
查看文件 @6bf2423
+++ b/trunk/conf/http.server.conf
查看文件 @6bf2423
@@ -3,6 +3,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8080;
--- a/trunk/conf/http.ts.live.conf
查看文件 @6bf2423
+++ b/trunk/conf/http.ts.live.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8080;
--- a/trunk/conf/ingest.conf
查看文件 @6bf2423
+++ b/trunk/conf/ingest.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     ingest livestream {
         enabled      on;
--- a/trunk/conf/origin.conf
查看文件 @6bf2423
+++ b/trunk/conf/origin.conf
查看文件 @6bf2423
@@ -4,7 +4,8 @@
 listen              19350;
 max_connections     1000;
-pid                 objs/origin.pid;
-srs_log_file        ./objs/origin.log;
+daemon              off;
+srs_log_tank        console;
+pid                 ./objs/origin.pid;
 vhost __defaultVhost__ {
 }
--- a/trunk/conf/push.flv.conf
查看文件 @6bf2423
+++ b/trunk/conf/push.flv.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8080;
--- a/trunk/conf/push.mpegts.over.udp.conf
查看文件 @6bf2423
+++ b/trunk/conf/push.mpegts.over.udp.conf
查看文件 @6bf2423
@@ -5,6 +5,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 stream_caster {
     enabled         on;
     caster          mpegts_over_udp;
--- a/trunk/conf/push.rtsp.conf
查看文件 @6bf2423
+++ b/trunk/conf/push.rtsp.conf
查看文件 @6bf2423
@@ -5,6 +5,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 stream_caster {
     enabled         on;
     caster          rtsp;
--- a/trunk/conf/realtime.conf
查看文件 @6bf2423
+++ b/trunk/conf/realtime.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     gop_cache       off;
     queue_length    10;
--- a/trunk/conf/rtmp.conf
查看文件 @6bf2423
+++ b/trunk/conf/rtmp.conf
查看文件 @6bf2423
@@ -4,5 +4,7 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
 }
--- a/trunk/conf/security.deny.publish.conf
查看文件 @6bf2423
+++ b/trunk/conf/security.deny.publish.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     security {
         enabled         on;
--- a/trunk/conf/transcode2hls.audio.only.conf
查看文件 @6bf2423
+++ b/trunk/conf/transcode2hls.audio.only.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     hls {
         enabled         on;
--- a/trunk/conf/transform.edge.conf
查看文件 @6bf2423
+++ b/trunk/conf/transform.edge.conf
查看文件 @6bf2423
@@ -4,6 +4,8 @@
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
 }
 vhost source.srs.com {
--- a/trunk/src/app/srs_app_source.cpp
查看文件 @6bf2423
+++ b/trunk/src/app/srs_app_source.cpp
查看文件 @6bf2423
@@ -1227,6 +1227,12 @@ int SrsSource::on_reload_vhost_forward(string vhost)
     // forwarders
     destroy_forwarders();
+    
+    // Don't start forwarders when source is not active.
+    if (_can_publish) {
+        return ret;
+    }
+    
     if ((ret = create_forwarders()) != ERROR_SUCCESS) {
         srs_error("create forwarders failed. ret=%d", ret);
         return ret;
@@ -1247,6 +1253,12 @@ int SrsSource::on_reload_vhost_hls(string vhost)
 #ifdef SRS_AUTO_HLS
     hls->on_unpublish();
+    
+    // Don't start forwarders when source is not active.
+    if (_can_publish) {
+        return ret;
+    }
+    
     if ((ret = hls->on_publish(_req, true)) != ERROR_SUCCESS) {
         srs_error("hls publish failed. ret=%d", ret);
         return ret;
@@ -1267,6 +1279,12 @@ int SrsSource::on_reload_vhost_hds(string vhost)
 #ifdef SRS_AUTO_HDS
     hds->on_unpublish();
+    
+    // Don't start forwarders when source is not active.
+    if (_can_publish) {
+        return ret;
+    }
+    
     if ((ret = hds->on_publish(_req)) != ERROR_SUCCESS) {
         srs_error("hds publish failed. ret=%d", ret);
         return ret;
@@ -1289,6 +1307,11 @@ int SrsSource::on_reload_vhost_dvr(string vhost)
     // cleanup dvr
     dvr->on_unpublish();
+    // Don't start forwarders when source is not active.
+    if (_can_publish) {
+        return ret;
+    }
+    
     // reinitialize the dvr, update plan.
     if ((ret = dvr->initialize(this, _req)) != ERROR_SUCCESS) {
         return ret;
@@ -1316,6 +1339,12 @@ int SrsSource::on_reload_vhost_transcode(string vhost)
 #ifdef SRS_AUTO_TRANSCODE
     encoder->on_unpublish();
+    
+    // Don't start forwarders when source is not active.
+    if (_can_publish) {
+        return ret;
+    }
+    
     if ((ret = encoder->on_publish(_req)) != ERROR_SUCCESS) {
         srs_error("start encoder failed. ret=%d", ret);
         return ret;
@@ -1896,7 +1925,6 @@ int SrsSource::on_video(SrsCommonMessage* shared_video)
     if (!m) {
         return ret;
     }
-    SrsAutoFree(SrsSharedPtrMessage, m);
     // consume the monotonically increase message.
     if (m->is_audio()) {
--- a/trunk/src/core/srs_core.hpp
查看文件 @6bf2423
+++ b/trunk/src/core/srs_core.hpp
查看文件 @6bf2423
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR       2
 #define VERSION_MINOR       0
-#define VERSION_REVISION    232
+#define VERSION_REVISION    234
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>
--- a/trunk/src/protocol/srs_rtmp_stack.cpp
查看文件 @6bf2423
+++ b/trunk/src/protocol/srs_rtmp_stack.cpp
查看文件 @6bf2423
@@ -1656,7 +1656,6 @@ int SrsProtocol::response_acknowledgement_message()
     SrsAcknowledgementPacket* pkt = new SrsAcknowledgementPacket();
     pkt->sequence_number = sequence_number;
-    srs_warn("ack sequence=%#x", sequence_number);
     // cache the message and use flush to send.
     if (!auto_response_when_recv) {