From a8781aee3e9dc046db3dc9f9e7436f4a4e13a492 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 6 Apr 2019 15:35:12 +0800 Subject: [PATCH] For #1304, Default HSTRS to on. 2.0.264 --- README.md | 2 ++ trunk/src/app/srs_app_config.cpp | 8 ++++---- trunk/src/core/srs_core.hpp | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 85ef7563e..67031972d 100755 --- a/README.md +++ b/README.md @@ -336,6 +336,7 @@ Remark: ## History +* v2.0, 2019-04-06, For [#1304][bug #1304], Default HSTRS to on. 2.0.264 * v2.0, 2019-04-05, [2.0 release6(2.0.263)][r2.0r6] released. 86994 lines. * v2.0, 2019-04-05, Merge [#1312][bug #1312], Fix GCC7 build error, this statement may fall through. 2.0.263 * v2.0, 2019-04-05, Merge [#1339][bug #1339], Support HTTP-FLV params. 2.0.262 @@ -1348,6 +1349,7 @@ Winlin [bug #1274]: https://github.com/ossrs/srs/pull/1274 [bug #1339]: https://github.com/ossrs/srs/pull/1339 [bug #1312]: https://github.com/ossrs/srs/pull/1312 +[bug #1304]: https://github.com/ossrs/srs/pull/1304 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828 diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 05b2624c4..5d90d0bee 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -4351,20 +4351,20 @@ bool SrsConfig::get_vhost_http_remux_hstrs(string vhost) { SrsConfDirective* conf = get_vhost(vhost); if (!conf) { - return false; + return true; } conf = conf->get("http_remux"); if (!conf) { - return false; + return true; } conf = conf->get("hstrs"); if (!conf || conf->arg0().empty()) { - return false; + return true; } - return SRS_CONF_PERFER_FALSE(conf->arg0()); + return SRS_CONF_PERFER_TRUE(conf->arg0()); } SrsConfDirective* SrsConfig::get_heartbeart() diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 70de12135..cd2470f27 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 263 +#define VERSION_REVISION 264 // generated by configure, only macros. #include