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

For #1304, Default HSTRS to on. 2.0.264

Browse source
This commit is contained in:
winlin 2019-04-06 15:35:12 +08:00
parent ffe4ac654d
commit a8781aee3e
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -336,6 +336,7 @@ Remark:
## History ## History
* v2.0, 2019-04-06, For [#1304][bug #1304], Default HSTRS to on. 2.0.264
* <strong>v2.0, 2019-04-05, [2.0 release6(2.0.263)][r2.0r6] released. 86994 lines.</strong> * <strong>v2.0, 2019-04-05, [2.0 release6(2.0.263)][r2.0r6] released. 86994 lines.</strong>
* 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 [#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 * 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 #1274]: https://github.com/ossrs/srs/pull/1274
[bug #1339]: https://github.com/ossrs/srs/pull/1339 [bug #1339]: https://github.com/ossrs/srs/pull/1339
[bug #1312]: https://github.com/ossrs/srs/pull/1312 [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 [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

8
trunk/src/app/srs_app_config.cpp
View file

@ -4351,20 +4351,20 @@ bool SrsConfig::get_vhost_http_remux_hstrs(string vhost)
{ {
SrsConfDirective* conf = get_vhost(vhost); SrsConfDirective* conf = get_vhost(vhost);
if (!conf) { if (!conf) {
return false; return true;
} }
conf = conf->get("http_remux"); conf = conf->get("http_remux");
if (!conf) { if (!conf) {
return false; return true;
} }
conf = conf->get("hstrs"); conf = conf->get("hstrs");
if (!conf || conf->arg0().empty()) { 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() SrsConfDirective* SrsConfig::get_heartbeart()

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 2 #define VERSION_MAJOR 2
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 263 #define VERSION_REVISION 264
// generated by configure, only macros. // generated by configure, only macros.
#include <srs_auto_headers.hpp> #include <srs_auto_headers.hpp>