diff --git a/README.md b/README.md index 4e2586712..82e81fc14 100755 --- a/README.md +++ b/README.md @@ -197,6 +197,7 @@ Please select according to languages: ### V3 changes +* v3.0, 2018-02-13, Fix [#1057][bug #1057], switch to simple handshake. 3.0.28 * v3.0, 2018-02-13, Fix [#1059][bug #1059], merge from 2.0, supports url with vhost in stream. 3.0.27 * v3.0, 2018-01-01, Fix [#913][bug #913], support complex error. 3.0.26 * v3.0, 2017-06-04, Fix [#299][bug #299], support experimental MPEG-DASH. 3.0.25 @@ -1440,6 +1441,7 @@ Winlin [bug #821]: https://github.com/ossrs/srs/issues/821 [bug #913]: https://github.com/ossrs/srs/issues/913 [bug #460]: https://github.com/ossrs/srs/issues/460 +[bug #1057]: https://github.com/ossrs/srs/issues/1057 [bug #xxxxxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 53f82bb30..0f9ef0b08 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -27,7 +27,7 @@ // current release version #define VERSION_MAJOR 3 #define VERSION_MINOR 0 -#define VERSION_REVISION 27 +#define VERSION_REVISION 28 // generated by configure, only macros. #include diff --git a/trunk/src/protocol/srs_rtmp_stack.cpp b/trunk/src/protocol/srs_rtmp_stack.cpp index 7434f3c3b..88c2a7bce 100644 --- a/trunk/src/protocol/srs_rtmp_stack.cpp +++ b/trunk/src/protocol/srs_rtmp_stack.cpp @@ -1876,8 +1876,9 @@ srs_error_t SrsRtmpClient::handshake() if ((err = simple_hs->handshake_with_server(hs_bytes, io)) != srs_success) { return srs_error_wrap(err, "simple handshake"); } + } else { + return srs_error_wrap(err, "complex handshake"); } - return srs_error_wrap(err, "complex handshake"); } srs_freep(hs_bytes); @@ -2272,8 +2273,9 @@ srs_error_t SrsRtmpServer::handshake() if ((err = simple_hs.handshake_with_client(hs_bytes, io)) != srs_success) { return srs_error_wrap(err, "simple handshake"); } + } else { + return srs_error_wrap(err, "complex handshake"); } - return srs_error_wrap(err, "complex handshake"); } srs_freep(hs_bytes);