winlin

fix default http port bug.

@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 * depends: jquery1.10 5 * depends: jquery1.10
6 * https://code.csdn.net/snippets/147103 6 * https://code.csdn.net/snippets/147103
7 * @see: http://blog.csdn.net/win_lin/article/details/17994347 7 * @see: http://blog.csdn.net/win_lin/article/details/17994347
8 - * v 1.0.16 8 + * v 1.0.17
9 */ 9 */
10 10
11 /** 11 /**
@@ -296,7 +296,6 @@ function parse_rtmp_url(rtmp_url) { @@ -296,7 +296,6 @@ function parse_rtmp_url(rtmp_url) {
296 a.href = rtmp_url.replace("rtmp://", "http://"); 296 a.href = rtmp_url.replace("rtmp://", "http://");
297 297
298 var vhost = a.hostname; 298 var vhost = a.hostname;
299 - var port = (a.port == "")? "1935":a.port;  
300 var app = a.pathname.substr(1, a.pathname.lastIndexOf("/") - 1); 299 var app = a.pathname.substr(1, a.pathname.lastIndexOf("/") - 1);
301 var stream = a.pathname.substr(a.pathname.lastIndexOf("/") + 1); 300 var stream = a.pathname.substr(a.pathname.lastIndexOf("/") + 1);
302 301
@@ -328,6 +327,7 @@ function parse_rtmp_url(rtmp_url) { @@ -328,6 +327,7 @@ function parse_rtmp_url(rtmp_url) {
328 if (rtmp_url.indexOf("://") > 0) { 327 if (rtmp_url.indexOf("://") > 0) {
329 schema = rtmp_url.substr(0, rtmp_url.indexOf("://")); 328 schema = rtmp_url.substr(0, rtmp_url.indexOf("://"));
330 } 329 }
  330 + var port = (a.port == "")? (schema=="http"?"80":"1935"):a.port;
331 331
332 var ret = { 332 var ret = {
333 url: rtmp_url, 333 url: rtmp_url,
@@ -401,10 +401,10 @@ @@ -401,10 +401,10 @@
401 <script type="text/javascript" src="js/json2.js"></script> 401 <script type="text/javascript" src="js/json2.js"></script>
402 <script type="text/javascript" src="js/srs.page.js"></script> 402 <script type="text/javascript" src="js/srs.page.js"></script>
403 <script type="text/javascript" src="js/srs.log.js"></script> 403 <script type="text/javascript" src="js/srs.log.js"></script>
404 -<script type="text/javascript" src="js/srs.player.js?v=1.29"></script> 404 +<script type="text/javascript" src="js/srs.player.js"></script>
405 <script type="text/javascript" src="js/srs.publisher.js"></script> 405 <script type="text/javascript" src="js/srs.publisher.js"></script>
406 <script type="text/javascript" src="js/srs.utility.js"></script> 406 <script type="text/javascript" src="js/srs.utility.js"></script>
407 -<script type="text/javascript" src="js/winlin.utility.js?v=1.0.16"></script> 407 +<script type="text/javascript" src="js/winlin.utility.js"></script>
408 <script type="text/javascript"> 408 <script type="text/javascript">
409 var srs_player = null; 409 var srs_player = null;
410 var url = null; 410 var url = null;