Skip to content

Commit

Permalink
merge from srs2, fix #503
Browse files Browse the repository at this point in the history
  • Loading branch information
@winlinvip
winlinvip committed Feb 9, 2017
2 parents 61d8ca7 + 99bffea commit 5fec59a
Show file tree
Hide file tree
Showing 34 changed files with 104 additions and 13 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ Please select your language:

### V2 changes

* 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>
Expand Down Expand Up @@ -1374,6 +1375,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

[bug #735]: https://github.com/ossrs/srs/issues/735
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/bandwidth.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
}

Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/dvr.path.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
dvr {
enabled on;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/dvr.segment.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
dvr {
enabled on;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/dvr.session.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
dvr {
enabled on;
Expand Down
3 changes: 2 additions & 1 deletion trunk/conf/edge.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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__ {
cluster {
mode remote;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/edge.token.traverse.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
cluster {
mode remote;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/ffmpeg.transcode.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
transcode {
enabled on;
Expand Down
4 changes: 2 additions & 2 deletions trunk/conf/forward.master.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
enabled on;
Expand Down
4 changes: 2 additions & 2 deletions trunk/conf/forward.slave.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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__ {
}
2 changes: 0 additions & 2 deletions trunk/conf/hds.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@

listen 1935;
max_connections 1000;

daemon off;
srs_log_tank console;
srs_log_level trace;

vhost __defaultVhost__ {
hds {
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/hls.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
hls {
enabled on;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/http.aac.live.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
http_server {
enabled on;
listen 8080;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/http.flv.live.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
http_server {
enabled on;
listen 8080;
Expand Down
3 changes: 2 additions & 1 deletion trunk/conf/http.flv.live.edge1.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion trunk/conf/http.flv.live.edge2.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/http.heartbeat.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

listen 1935
max_connections 1000;
daemon off;
srs_log_tank console;
heartbeat {
enabled on;
interval 9.3;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/http.hls.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
http_server {
enabled on;
listen 8080;
Expand Down
4 changes: 2 additions & 2 deletions trunk/conf/http.hooks.callback.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/http.mp3.live.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
http_server {
enabled on;
listen 8080;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/http.server.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
http_server {
enabled on;
listen 8080;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/http.ts.live.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
http_server {
enabled on;
listen 8080;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/ingest.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
ingest livestream {
enabled on;
Expand Down
4 changes: 2 additions & 2 deletions trunk/conf/origin.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

listen 19350;
max_connections 1000;
pid objs/origin.pid;
srs_log_file ./objs/origin.log;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
}
2 changes: 2 additions & 0 deletions trunk/conf/push.flv.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
http_server {
enabled on;
listen 8080;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/push.mpegts.over.udp.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
stream_caster {
enabled on;
caster mpegts_over_udp;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/push.rtsp.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
stream_caster {
enabled on;
caster rtsp;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/realtime.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
tcp_nodelay on
min_latency on;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/rtmp.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
}
2 changes: 2 additions & 0 deletions trunk/conf/security.deny.publish.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
security {
enabled on;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/transcode2hls.audio.only.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
hls {
enabled on;
Expand Down
2 changes: 2 additions & 0 deletions trunk/conf/transform.edge.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
}
vhost source.srs.com {
Expand Down
Loading

0 comments on commit 5fec59a

Please sign in to comment.