external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Fix #1057, switch to simple handshake. 3.0.28

Browse source
This commit is contained in:
winlin 2018-02-13 09:05:01 +08:00
parent a2cefe4dbd
commit db6b8cf914
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -197,6 +197,7 @@ Please select according to languages:
### V3 changes ### 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-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, 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 * 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 #821]: https://github.com/ossrs/srs/issues/821
[bug #913]: https://github.com/ossrs/srs/issues/913 [bug #913]: https://github.com/ossrs/srs/issues/913
[bug #460]: https://github.com/ossrs/srs/issues/460 [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 [bug #xxxxxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxxxxx
[exo #828]: https://github.com/google/ExoPlayer/pull/828 [exo #828]: https://github.com/google/ExoPlayer/pull/828

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

@ -27,7 +27,7 @@
// 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 27 #define VERSION_REVISION 28
// generated by configure, only macros. // generated by configure, only macros.
#include <srs_auto_headers.hpp> #include <srs_auto_headers.hpp>

6
trunk/src/protocol/srs_rtmp_stack.cpp
View file

@ -1876,8 +1876,9 @@ srs_error_t SrsRtmpClient::handshake()
if ((err = simple_hs->handshake_with_server(hs_bytes, io)) != srs_success) { if ((err = simple_hs->handshake_with_server(hs_bytes, io)) != srs_success) {
return srs_error_wrap(err, "simple handshake"); 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); 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) { if ((err = simple_hs.handshake_with_client(hs_bytes, io)) != srs_success) {
return srs_error_wrap(err, "simple handshake"); 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); srs_freep(hs_bytes);