胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
c0a6c3ef 2 parents e27c95b0 d9aca8ab

merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79

内嵌 并排对比
正在显示 3 个修改的文件 包含 3 行增加 和 2 行删除
@@ -501,6 +501,7 @@ Supported operating systems and hardware: @@ -501,6 +501,7 @@ Supported operating systems and hardware:
501 * 2013-10-17, Created.<br/> 501 * 2013-10-17, Created.<br/>
502 502
503 ## History 503 ## History
  504 +* v2.0, 2014-12-29, hotfix [#267](https://github.com/winlinvip/simple-rtmp-server/issues/267), the forward dest ep should use server. 2.0.79
504 * v2.0, 2014-12-29, hotfix [#268](https://github.com/winlinvip/simple-rtmp-server/issues/268), the hls pcr is negative when startup. 2.0.78 505 * v2.0, 2014-12-29, hotfix [#268](https://github.com/winlinvip/simple-rtmp-server/issues/268), the hls pcr is negative when startup. 2.0.78
505 * v2.0, 2014-12-22, hotfix [#264](https://github.com/winlinvip/simple-rtmp-server/issues/264), ignore NALU when sequence header to make HLS happy. 2.0.76 506 * v2.0, 2014-12-22, hotfix [#264](https://github.com/winlinvip/simple-rtmp-server/issues/264), ignore NALU when sequence header to make HLS happy. 2.0.76
506 * v2.0, 2014-12-20, hotfix [#264](https://github.com/winlinvip/simple-rtmp-server/issues/264), support disconnect publish connect when hls error. 2.0.75 507 * v2.0, 2014-12-20, hotfix [#264](https://github.com/winlinvip/simple-rtmp-server/issues/264), support disconnect publish connect when hls error. 2.0.75
@@ -119,7 +119,7 @@ int SrsForwarder::on_publish() @@ -119,7 +119,7 @@ int SrsForwarder::on_publish()
119 if (_ep_forward == SRS_CONSTS_LOCALHOST) { 119 if (_ep_forward == SRS_CONSTS_LOCALHOST) {
120 dest_ep += req->host; 120 dest_ep += req->host;
121 } else { 121 } else {
122 - dest_ep += _ep_forward; 122 + dest_ep += server;
123 } 123 }
124 dest_ep += ":"; 124 dest_ep += ":";
125 dest_ep += port; 125 dest_ep += port;
@@ -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 2 32 #define VERSION_MAJOR 2
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 78 34 +#define VERSION_REVISION 79
35 // server info. 35 // server info.
36 #define RTMP_SIG_SRS_KEY "SRS" 36 #define RTMP_SIG_SRS_KEY "SRS"
37 #define RTMP_SIG_SRS_ROLE "origin/edge server" 37 #define RTMP_SIG_SRS_ROLE "origin/edge server"