Skip to content

Commit 86deeca

Browse files
committed
[dev] update CI script and README files.
1 parent 18cc40e commit 86deeca

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

.travis.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@ language: c
22

33
install:
44
- cd ..
5-
- wget http://nginx.org/download/nginx-1.12.2.tar.gz
6-
- tar zxvf nginx-1.12.2.tar.gz
7-
- cd nginx-1.12.2
5+
- wget http://nginx.org/download/nginx-1.14.2.tar.gz
6+
- tar zxvf nginx-1.14.2.tar.gz
7+
- cd nginx-1.14.2
88

99
script:
10-
- ./configure --add-module=../nginx-http-flv-module && make -j 8
11-
- ./configure --add-dynamic-module=../nginx-http-flv-module && make -j 8
10+
- ./configure --add-module=../nginx-http-flv-module && make -j 4
11+
- ./configure --add-dynamic-module=../nginx-http-flv-module && make -j 4
12+
13+
after_script:
14+
- make clean
15+
- cd ..
16+
- rm -rf "nginx-1.14.2*"

README.CN.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,11 @@ nginx-http-flv-module包含了[nginx-rtmp-module](https://github.com/arut/nginx-
298298
rtmp_socket_dir /tmp;
299299

300300
rtmp {
301-
out_queue 4096;
302-
out_cork 8;
303-
max_streams 128;
304-
timeout 15s;
301+
out_queue 4096;
302+
out_cork 8;
303+
max_streams 128;
304+
timeout 15s;
305+
drop_idle_publisher 15s;
305306

306307
log_interval 5s; #log模块在access.log中记录日志的间隔时间,对调试非常有用
307308
log_size 1m; #log模块用来记录日志的缓冲区大小

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,11 @@ The directive `worker_processes` of value 1 is preferable to other values, becau
299299
rtmp_socket_dir /tmp;
300300

301301
rtmp {
302-
out_queue 4096;
303-
out_cork 8;
304-
max_streams 128;
305-
timeout 15s;
302+
out_queue 4096;
303+
out_cork 8;
304+
max_streams 128;
305+
timeout 15s;
306+
drop_idle_publisher 15s;
306307

307308
log_interval 5s; #interval used by log module to log in access.log, it is very useful for debug
308309
log_size 1m; #buffer size used by log module to log in access.log

ngx_http_flv_live_module.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ ngx_rtmp_close_stream_pt http_flv_live_next_close_stream;
3434

3535
typedef struct ngx_http_flv_live_ctx_s {
3636
ngx_rtmp_session_t *s;
37-
ngx_flag_t flv_live;
3837
ngx_flag_t header_sent;
3938

4039
ngx_str_t app;

0 commit comments

Comments
 (0)