Skip to content

Commit 1d2d497

Browse files
committed
[misc] fix a bug blocked nginx and update LICENSE and AUTHORS files.
1 parent 5bb0e2f commit 1d2d497

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

AUTHORS

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,16 @@ Project author:
66
Contacts:
77
88
9+
10+
Winshining
11+
Beijing, China
12+
13+
Contacts:
14+
15+
16+
Gnolizuh
17+
Beijing, China
18+
19+
Contacts:
20+
21+

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ BSD 2-Clause License
22

33
Copyright (c) 2012-2014, Roman Arutyunyan
44
Copyright (c) 2017, Gnolizuh
5-
Copyright (c) 2017, winshining
5+
Copyright (c) 2017-2018, Winshining
66
All rights reserved.
77

88
Redistribution and use in source and binary forms, with or without

ngx_http_flv_live_module.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -766,15 +766,17 @@ ngx_http_flv_live_read_handler(ngx_event_t *rev)
766766
return;
767767
}
768768

769-
do {
770-
n = c->recv(c, buf, sizeof(buf));
769+
n = c->recv(c, buf, sizeof(buf));
771770

772-
if (n == NGX_ERROR || n == 0) {
773-
ngx_rtmp_finalize_session(s);
771+
if (n == NGX_EAGAIN || n == 0) {
772+
ngx_add_timer(c->read, s->timeout);
774773

775-
break;
774+
if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
775+
ngx_rtmp_finalize_session(s);
776776
}
777-
} while (n != NGX_EAGAIN);
777+
} else {
778+
ngx_rtmp_finalize_session(s);
779+
}
778780
}
779781

780782

0 commit comments

Comments
 (0)