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

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

Browse source
This commit is contained in:
winlin 2014-12-29 09:07:50 +08:00
commit c0a6c3efa3
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_forward.cpp
View file

@ -119,7 +119,7 @@ int SrsForwarder::on_publish()
if (_ep_forward == SRS_CONSTS_LOCALHOST) {
dest_ep += req->host;
} else {
dest_ep += _ep_forward;
dest_ep += server;
}
dest_ep += ":";
dest_ep += port;

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
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 78
#define VERSION_REVISION 79
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server"