胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
7fe60b5b 1 parent 7bbb3bae

fix #735 config transform refer_publish invalid. 3.0.14

内嵌 并排对比
正在显示 3 个修改的文件 包含 5 行增加 和 3 行删除
@@ -184,6 +184,7 @@ Please select your language: @@ -184,6 +184,7 @@ Please select your language:
184 184
185 ### V3 changes 185 ### V3 changes
186 186
  187 +* v3.0, 2017-01-11, fix [#735][bug #735] config transform refer_publish invalid. 3.0.14
187 * v3.0, 2017-01-06, for [#730][bug #730] support config in/out ack size. 3.0.13 188 * v3.0, 2017-01-06, for [#730][bug #730] support config in/out ack size. 3.0.13
188 * v3.0, 2017-01-06, for [#711][bug #711] support perfile for transcode. 3.0.12 189 * v3.0, 2017-01-06, for [#711][bug #711] support perfile for transcode. 3.0.12
189 * v3.0, 2017-01-05, patch ST for valgrind and ARM. 3.0.11 190 * v3.0, 2017-01-05, patch ST for valgrind and ARM. 3.0.11
@@ -1367,6 +1368,7 @@ Winlin @@ -1367,6 +1368,7 @@ Winlin
1367 [bug #513]: https://github.com/ossrs/srs/issues/513 1368 [bug #513]: https://github.com/ossrs/srs/issues/513
1368 [bug #730]: https://github.com/ossrs/srs/issues/730 1369 [bug #730]: https://github.com/ossrs/srs/issues/730
1369 [bug #635]: https://github.com/ossrs/srs/issues/635 1370 [bug #635]: https://github.com/ossrs/srs/issues/635
  1371 +[bug #735]: https://github.com/ossrs/srs/issues/735
1370 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx 1372 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
1371 1373
1372 [exo #828]: https://github.com/google/ExoPlayer/pull/828 1374 [exo #828]: https://github.com/google/ExoPlayer/pull/828
@@ -391,10 +391,10 @@ int srs_config_transform_vhost(SrsConfDirective* root) @@ -391,10 +391,10 @@ int srs_config_transform_vhost(SrsConfDirective* root)
391 if (n == "refer") { 391 if (n == "refer") {
392 SrsConfDirective* all = refer->get_or_create("all"); 392 SrsConfDirective* all = refer->get_or_create("all");
393 all->args = conf->args; 393 all->args = conf->args;
394 - } else if (n == "play") { 394 + } else if (n == "refer_play") {
395 SrsConfDirective* play = refer->get_or_create("play"); 395 SrsConfDirective* play = refer->get_or_create("play");
396 play->args = conf->args; 396 play->args = conf->args;
397 - } else if (n == "publish") { 397 + } else if (n == "refer_publish") {
398 SrsConfDirective* publish = refer->get_or_create("publish"); 398 SrsConfDirective* publish = refer->get_or_create("publish");
399 publish->args = conf->args; 399 publish->args = conf->args;
400 } 400 }
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 3 32 #define VERSION_MAJOR 3
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 13 34 +#define VERSION_REVISION 14
35 35
36 // generated by configure, only macros. 36 // generated by configure, only macros.
37 #include <srs_auto_headers.hpp> 37 #include <srs_auto_headers.hpp>