3833 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	88a5de00b2	修正拼写错误	2019-11-13 14:05:15 +08:00
夏楚	94eebdadf1	Update README_CN.md	2019-11-13 10:45:52 +08:00
夏楚	d1fd674c36	Update README.md	2019-11-13 10:43:46 +08:00
xiongziliang	3554fe920f	更新ZLToolKit	2019-11-12 10:00:55 +08:00
xiongziliang	8c0596bfb2	更新ZLToolKit(修复发送缓存覆盖导致ssl错误的bug)	2019-11-12 09:52:34 +08:00
xiongziliang	1b6e61c413	1、修复#125 ... 2、修复非法rtsp url导致异常的问题	2019-11-11 19:03:03 +08:00
xiongziliang	36a3f4225c	Merge remote-tracking branch 'origin/master'	2019-11-11 16:22:31 +08:00
xiongziliang	d6b319b993	尝试修复 #125	2019-11-11 16:22:12 +08:00
夏楚	c2e3dfbbe9	Merge pull request #124 from gemfield/master ... Add Docker support	2019-11-08 16:54:23 +08:00
Gemfield	814e94b6b0	Add Docker support	2019-11-08 16:50:23 +08:00
xiongziliang	5a1503008f	完善注释	2019-11-08 15:55:26 +08:00
xiongziliang	a8a4f267f7	添加配置项，控制在关闭hook时，推流是否转协议或录制	2019-11-08 15:54:13 +08:00
xiongziliang	9b7d62347e	完善	2019-11-08 15:26:46 +08:00
xiongziliang	9d7b2821b7	初步支持ssl多证书	2019-11-08 15:20:54 +08:00
xiongziliang	ccbd1d4a83	添加hls.segRetain配置项，修复hls切片等于segNum+1的问题	2019-11-05 10:27:28 +08:00
xiongziliang	35c4c05e7b	修复setServerConfig接口保存配置文件相关bug	2019-11-04 09:21:11 +08:00
xiongziliang	a30a83d665	添加H265相关接口	2019-11-01 15:40:21 +08:00
baiyfcu	5d1df021fe	Merge pull request #9 from xiongziliang/master ... update	2019-10-30 13:20:09 +08:00
xiongziliang	0bff2ad176	优化精简Http服务器代码	2019-10-29 09:16:52 +08:00
xiongziliang	43e1cc69a8	优化http服务器	2019-10-29 00:35:44 +08:00
xiongziliang	fd10ef1187	添加下载文件http api范例	2019-10-28 17:23:16 +08:00
xiongziliang	52a663033d	Merge remote-tracking branch 'origin/master'	2019-10-28 16:50:40 +08:00
xiongziliang	7ed5b7c2ba	http api服务器支持发送大文件	2019-10-28 16:50:15 +08:00
夏楚	e97f517b3a	Update README_CN.md	2019-10-28 13:57:09 +08:00
夏楚	cad870a987	Update README_CN.md	2019-10-28 13:55:48 +08:00
夏楚	f949ca0e7c	Update README.md	2019-10-28 13:55:01 +08:00
xiongziliang	7c16f37d64	优先判断文件然后再判断http-flv	2019-10-27 09:15:29 +08:00
xiongziliang	4ae66f0672	修复mmap相关bug	2019-10-27 03:42:56 +08:00
xiongziliang	4d1d6b1467	暂时禁用mmap	2019-10-27 03:00:19 +08:00
xiongziliang	6023885e93	抽象整理HttpBody类，fread模式下使用循环池提升内存性能	2019-10-27 02:04:51 +08:00
xiongziliang	144fb20339	http服务器支持mmap,提示性能	2019-10-26 18:41:42 +08:00
xiongziliang	2bc918cd2e	去除gfs依赖	2019-10-25 10:46:59 +08:00
xiongziliang	6a8a486171	重新git常规方式添加	2019-10-25 10:46:38 +08:00
xiongziliang	5cae433158	去除git lfs文件	2019-10-25 10:43:55 +08:00
xiongziliang	8e48ab3463	解决defunct进程的问题	2019-10-24 11:42:39 +08:00
xiongziliang	1f89a86892	新增getWorkThreadsLoad接口	2019-10-24 11:21:55 +08:00
xiongziliang	a739bd7304	完善日志	2019-10-23 12:00:53 +08:00
xiongziliang	7e1e735203	更新ZLToolKit	2019-10-21 09:03:11 +08:00
xiongziliang	a4dab8767f	支持相对路径	2019-10-18 10:06:18 +08:00
xiongziliang	0aa28b2848	简化代码	2019-10-18 10:02:42 +08:00
xiongziliang	0f5582689b	防止越权访问	2019-10-18 09:58:22 +08:00
xiongziliang	67d2beb52a	配置文件支持相对路径，http文件服务器防止访问根目录父目录	2019-10-18 09:51:20 +08:00
xiongziliang	cbb25eadef	Merge remote-tracking branch 'origin/master'	2019-10-16 11:10:40 +08:00
xiongziliang	3bad329f09	修复resetTracks情况下 MP4录制可能出现的bug	2019-10-16 11:10:20 +08:00
夏楚	82098a284c	Update .gitattributes	2019-10-16 10:40:19 +08:00
夏楚	065b2cf678	Update FUNDING.yml	2019-10-15 18:49:35 +08:00
夏楚	f816ea1727	Create FUNDING.yml	2019-10-15 18:23:14 +08:00
xiongziliang	68d29ba025	rtsp忽略无效的aac track	2019-10-14 16:52:15 +08:00
xiongziliang	a68368a7f3	修复#109	2019-10-14 10:15:46 +08:00
xiongziliang	08386b958c	覆盖时间戳需要明确参数指定，防止误判	2019-10-12 22:44:16 +08:00