胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
0a8d4092 2 parents 2f5f7d4a 625ca237

merge from 2.0

内嵌 并排对比
正在显示 3 个修改的文件 包含 6 行增加 和 4 行删除
@@ -360,6 +360,7 @@ Remark: @@ -360,6 +360,7 @@ Remark:
360 360
361 ### Releases 361 ### Releases
362 362
  363 +* 2016-11-09, [Release v2.0-b2][r2.0b2], 2.0 beta2, 2.0.221, 86691 lines.
363 * 2016-09-09, [Release v2.0-b1][r2.0b1], 2.0 beta1, 2.0.215, 89941 lines. 364 * 2016-09-09, [Release v2.0-b1][r2.0b1], 2.0 beta1, 2.0.215, 89941 lines.
364 * 2016-08-06, [Release v2.0-b0][r2.0b0], 2.0 beta0, 2.0.210, 89704 lines. 365 * 2016-08-06, [Release v2.0-b0][r2.0b0], 2.0 beta0, 2.0.210, 89704 lines.
365 * 2015-12-23, [Release v2.0-a3][r2.0a3], 2.0 alpha3, 2.0.205, 89544 lines. 366 * 2015-12-23, [Release v2.0-a3][r2.0a3], 2.0 alpha3, 2.0.205, 89544 lines.
@@ -1311,6 +1312,7 @@ Winlin @@ -1311,6 +1312,7 @@ Winlin
1311 1312
1312 [exo #828]: https://github.com/google/ExoPlayer/pull/828 1313 [exo #828]: https://github.com/google/ExoPlayer/pull/828
1313 1314
  1315 +[r2.0b2]: https://github.com/ossrs/srs/releases/tag/v2.0-b2
1314 [r2.0b1]: https://github.com/ossrs/srs/releases/tag/v2.0-b1 1316 [r2.0b1]: https://github.com/ossrs/srs/releases/tag/v2.0-b1
1315 [r2.0b0]: https://github.com/ossrs/srs/releases/tag/v2.0-b0 1317 [r2.0b0]: https://github.com/ossrs/srs/releases/tag/v2.0-b0
1316 [r2.0a3]: https://github.com/ossrs/srs/releases/tag/v2.0-a3 1318 [r2.0a3]: https://github.com/ossrs/srs/releases/tag/v2.0-a3
@@ -1351,6 +1353,6 @@ Winlin @@ -1351,6 +1353,6 @@ Winlin
1351 [branch2]: https://github.com/ossrs/srs/tree/2.0release 1353 [branch2]: https://github.com/ossrs/srs/tree/2.0release
1352 [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20 1354 [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20
1353 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30 1355 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30
1354 -[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.215.zip  
1355 -[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.215.zip 1356 +[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.221.zip
  1357 +[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.221.zip
1356 1358
@@ -1044,7 +1044,7 @@ bool SrsSource::expired() @@ -1044,7 +1044,7 @@ bool SrsSource::expired()
1044 } 1044 }
1045 1045
1046 // still publishing? 1046 // still publishing?
1047 - if (!_can_publish) { 1047 + if (!_can_publish || !publish_edge->can_publish()) {
1048 return false; 1048 return false;
1049 } 1049 }
1050 1050
@@ -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 220 34 +#define VERSION_REVISION 221
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>