diff --git a/README.md b/README.md index 125eaf56c..b34945fb4 100755 --- a/README.md +++ b/README.md @@ -220,6 +220,7 @@ Please select according to languages: ### V2 changes +* v2.0, 2018-07-17, Merge [#1176][bug #1176], fix scaned issues. 2.0.248 * v2.0, 2018-02-28, Merge [#1077][bug #1077], fix crash for edge HLS. 2.0.247 * v2.0, 2018-02-13, Fix [#1059][bug #1059], support vhost in stream parameters. 2.0.246 * v2.0, 2018-01-07, Merge [#1045][bug #1045], fix [#1044][bug #1044], TCP connection alive detection. 2.0.245 @@ -1421,6 +1422,7 @@ Winlin [bug #1045]: https://github.com/ossrs/srs/issues/1045 [bug #1059]: https://github.com/ossrs/srs/issues/1059 [bug #1077]: https://github.com/ossrs/srs/issues/1077 +[bug #1176]: https://github.com/ossrs/srs/issues/1176 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [bug #735]: https://github.com/ossrs/srs/issues/735 diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index 0e0cb18df..1f0a25d91 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -653,6 +653,7 @@ srs_error_t SrsServer::acquire_pid_file() if (fcntl(fd, F_SETLK, &lock) == -1) { if(errno == EACCES || errno == EAGAIN) { + ::close(fd); srs_error("srs is already running!"); return srs_error_new(ERROR_SYSTEM_PID_ALREADY_RUNNING, "srs is already running"); } diff --git a/trunk/src/kernel/srs_kernel_codec.cpp b/trunk/src/kernel/srs_kernel_codec.cpp index 90c5cf360..b8cdb7fac 100644 --- a/trunk/src/kernel/srs_kernel_codec.cpp +++ b/trunk/src/kernel/srs_kernel_codec.cpp @@ -203,7 +203,7 @@ bool SrsFlvAudio::aac(char* data, int size) // 1 = 11 kHz = 11025 Hz // 2 = 22 kHz = 22050 Hz // 3 = 44 kHz = 44100 Hz -int srs_flv_srates[] = {5512, 11025, 22050, 44100}; +int srs_flv_srates[] = {5512, 11025, 22050, 44100, 0}; // the sample rates in the codec, // in the sequence header. diff --git a/trunk/src/service/srs_service_st.cpp b/trunk/src/service/srs_service_st.cpp index 9a5eea12e..a30c6d524 100644 --- a/trunk/src/service/srs_service_st.cpp +++ b/trunk/src/service/srs_service_st.cpp @@ -136,6 +136,7 @@ srs_error_t srs_socket_connect(string server, int port, int64_t tm, srs_netfd_t* srs_assert(!stfd); stfd = st_netfd_open_socket(sock); if(stfd == NULL){ + ::close(sock); return srs_error_new(ERROR_ST_OPEN_SOCKET, "open socket"); }