external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2016-09-01 16:51:18 +08:00
commit 7d96a33207
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -403,6 +403,7 @@ Remark:
======= =======
## History ## History
* v2.0, 2016-09-01, workaround [bug #511] the fly stfd in close. 2.0.211
* v2.0, 2016-08-30, comment the pcr. * v2.0, 2016-08-30, comment the pcr.
* v2.0, 2016-08-18, fix [srs-librtmp#4](https://github.com/ossrs/srs-librtmp/issues/4) filter frame. * v2.0, 2016-08-18, fix [srs-librtmp#4](https://github.com/ossrs/srs-librtmp/issues/4) filter frame.
* v2.0, 2016-08-10, fix socket timeout for librtmp. * v2.0, 2016-08-10, fix socket timeout for librtmp.
@ -1312,6 +1313,7 @@ Winlin
[bug #546]: https://github.com/ossrs/srs/issues/546 [bug #546]: https://github.com/ossrs/srs/issues/546
[bug #418]: https://github.com/ossrs/srs/issues/418 [bug #418]: https://github.com/ossrs/srs/issues/418
[bug #509]: https://github.com/ossrs/srs/issues/509 [bug #509]: https://github.com/ossrs/srs/issues/509
[bug #511]: https://github.com/ossrs/srs/issues/511
[bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
[exo #828]: https://github.com/google/ExoPlayer/pull/828 [exo #828]: https://github.com/google/ExoPlayer/pull/828

7
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -479,8 +479,11 @@ int SrsRtmpConn::on_reload_vhost_removed(string vhost)
// if the vhost connected is removed, disconnect the client. // if the vhost connected is removed, disconnect the client.
srs_trace("vhost %s removed/disabled, close client url=%s", srs_trace("vhost %s removed/disabled, close client url=%s",
vhost.c_str(), req->get_stream_url().c_str()); vhost.c_str(), req->get_stream_url().c_str());
srs_close_stfd(stfd); // should never close the fd in another thread,
// one fd should managed by one thread, we should use interrupt instead.
// so we just ignore the vhost enabled event.
//srs_close_stfd(stfd);
return ret; return ret;
} }

10
trunk/src/app/srs_app_st.cpp
View file

@ -564,13 +564,9 @@ int srs_st_init()
void srs_close_stfd(st_netfd_t& stfd) void srs_close_stfd(st_netfd_t& stfd)
{ {
if (stfd) { if (stfd) {
int fd = st_netfd_fileno(stfd); // we must ensure the close is ok.
st_netfd_close(stfd); int err = st_netfd_close(stfd);
stfd = NULL; srs_assert(err != -1);
// st does not close it sometimes,
// close it manually.
close(fd);
} }
} }

1
trunk/src/app/srs_app_st.hpp
View file

@ -254,6 +254,7 @@ public:
extern int srs_st_init(); extern int srs_st_init();
// close the netfd, and close the underlayer fd. // close the netfd, and close the underlayer fd.
// @remark when close, user must ensure io completed.
extern void srs_close_stfd(st_netfd_t& stfd); extern void srs_close_stfd(st_netfd_t& stfd);
#endif #endif

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR 3 #define VERSION_MAJOR 3
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 210 #define VERSION_REVISION 211
// generated by configure, only macros. // generated by configure, only macros.
#include <srs_auto_headers.hpp> #include <srs_auto_headers.hpp>