3 Commits (ad9a22c0b2f1b213fa904ebd0c23c6fb72f5fa8f)

Author	SHA1	Message	Date
macbookpro	02ee38a14c	fix player timeout ... 修改了播放器超时断开的bug	2018-11-27 11:15:07 +08:00
macbookpro	9cb4462a8b	Merge branch 'master' of /Users/jiaozebo/go/src/github.com/EasyDarwin/EasyDarwin with conflicts.	2018-11-27 11:12:15 +08:00
macbookpro	09b65d1f61	fix "timeout" config not working issue. ... fix pull stream error when url do not contain a port 修改了"timeout"配置不生效的bug 修改了拉流时如果url不含有端口，则不成功的bug	2018-11-22 23:22:52 +08:00