From 7fe60b5bbf3315eeec0aff774f3b4a55c089b3f2 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 11 Jan 2017 09:45:22 +0800 Subject: [PATCH] fix #735 config transform refer_publish invalid. 3.0.14 --- README.md | 2 ++ trunk/src/app/srs_app_config.cpp | 4 ++-- trunk/src/core/srs_core.hpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3d547ee73..2b324878b 100755 --- a/README.md +++ b/README.md @@ -184,6 +184,7 @@ Please select your language: ### V3 changes +* v3.0, 2017-01-11, fix [#735][bug #735] config transform refer_publish invalid. 3.0.14 * v3.0, 2017-01-06, for [#730][bug #730] support config in/out ack size. 3.0.13 * v3.0, 2017-01-06, for [#711][bug #711] support perfile for transcode. 3.0.12 * v3.0, 2017-01-05, patch ST for valgrind and ARM. 3.0.11 @@ -1367,6 +1368,7 @@ Winlin [bug #513]: https://github.com/ossrs/srs/issues/513 [bug #730]: https://github.com/ossrs/srs/issues/730 [bug #635]: https://github.com/ossrs/srs/issues/635 +[bug #735]: https://github.com/ossrs/srs/issues/735 [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 4bc4d4621..e735a12e6 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -391,10 +391,10 @@ int srs_config_transform_vhost(SrsConfDirective* root) if (n == "refer") { SrsConfDirective* all = refer->get_or_create("all"); all->args = conf->args; - } else if (n == "play") { + } else if (n == "refer_play") { SrsConfDirective* play = refer->get_or_create("play"); play->args = conf->args; - } else if (n == "publish") { + } else if (n == "refer_publish") { SrsConfDirective* publish = refer->get_or_create("publish"); publish->args = conf->args; } diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 895c82da9..3e61be528 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 3 #define VERSION_MINOR 0 -#define VERSION_REVISION 13 +#define VERSION_REVISION 14 // generated by configure, only macros. #include