fix default http port bug.

pull/609/head
winlin 9 years ago
parent a2d235f015
commit 4841435b14

@ -5,7 +5,7 @@
* depends: jquery1.10 * depends: jquery1.10
* https://code.csdn.net/snippets/147103 * https://code.csdn.net/snippets/147103
* @see: http://blog.csdn.net/win_lin/article/details/17994347 * @see: http://blog.csdn.net/win_lin/article/details/17994347
* v 1.0.16 * v 1.0.17
*/ */
/** /**
@ -296,7 +296,6 @@ function parse_rtmp_url(rtmp_url) {
a.href = rtmp_url.replace("rtmp://", "http://"); a.href = rtmp_url.replace("rtmp://", "http://");
var vhost = a.hostname; var vhost = a.hostname;
var port = (a.port == "")? "1935":a.port;
var app = a.pathname.substr(1, a.pathname.lastIndexOf("/") - 1); var app = a.pathname.substr(1, a.pathname.lastIndexOf("/") - 1);
var stream = a.pathname.substr(a.pathname.lastIndexOf("/") + 1); var stream = a.pathname.substr(a.pathname.lastIndexOf("/") + 1);
@ -328,6 +327,7 @@ function parse_rtmp_url(rtmp_url) {
if (rtmp_url.indexOf("://") > 0) { if (rtmp_url.indexOf("://") > 0) {
schema = rtmp_url.substr(0, rtmp_url.indexOf("://")); schema = rtmp_url.substr(0, rtmp_url.indexOf("://"));
} }
var port = (a.port == "")? (schema=="http"?"80":"1935"):a.port;
var ret = { var ret = {
url: rtmp_url, url: rtmp_url,

@ -401,10 +401,10 @@
<script type="text/javascript" src="js/json2.js"></script> <script type="text/javascript" src="js/json2.js"></script>
<script type="text/javascript" src="js/srs.page.js"></script> <script type="text/javascript" src="js/srs.page.js"></script>
<script type="text/javascript" src="js/srs.log.js"></script> <script type="text/javascript" src="js/srs.log.js"></script>
<script type="text/javascript" src="js/srs.player.js?v=1.29"></script> <script type="text/javascript" src="js/srs.player.js"></script>
<script type="text/javascript" src="js/srs.publisher.js"></script> <script type="text/javascript" src="js/srs.publisher.js"></script>
<script type="text/javascript" src="js/srs.utility.js"></script> <script type="text/javascript" src="js/srs.utility.js"></script>
<script type="text/javascript" src="js/winlin.utility.js?v=1.0.16"></script> <script type="text/javascript" src="js/winlin.utility.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var srs_player = null; var srs_player = null;
var url = null; var url = null;

Loading…
Cancel
Save