[dev] merge branch 'vhost'.

Author: winshining

README.CN.md

@@ -4,7 +4,7 @@
 
 基于[nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module)的流媒体服务器。
 
-[English README](https://github.com/winshining/nginx-http-flv-module/blob/master/README.md)。
+[English README](https://github.com/winshining/nginx-http-flv-module/blob/vhost/README.md)。
 
 如果您喜欢这个模块，可以通过赞赏来支持我的工作，非常感谢！
 
@@ -16,7 +16,7 @@
 
 * Roman Arutyunyan，[nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module)的作者。
 
-* 贡献者，详情见[AUTHORS](https://github.com/winshining/nginx-http-flv-module/blob/master/AUTHORS)。
+* 贡献者，详情见[AUTHORS](https://github.com/winshining/nginx-http-flv-module/blob/vhost/AUTHORS)。
 
 ## 功能
 

README.md

@@ -4,7 +4,7 @@
 
 Media streaming server based on [nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module).
 
-[中文说明](https://github.com/winshining/nginx-http-flv-module/blob/master/README.CN.md).
+[中文说明](https://github.com/winshining/nginx-http-flv-module/blob/vhost/README.CN.md).
 
 Donate if you like this module. Many thanks to you!
 
@@ -16,7 +16,7 @@ Donate if you like this module. Many thanks to you!
 
 * Roman Arutyunyan, who created [nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module).
 
-* Contributors, refer to [AUTHORS](https://github.com/winshining/nginx-http-flv-module/blob/master/AUTHORS) for details.
+* Contributors, refer to [AUTHORS](https://github.com/winshining/nginx-http-flv-module/blob/vhost/AUTHORS) for details.
 
 ## Features
 

ngx_rtmp.c

@@ -326,6 +326,11 @@ ngx_rtmp_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     *cf = pcf;
 
+    cscfp = cmcf->servers.elts;
+    for (s = 0; s < cmcf->servers.nelts; s++) {
+        cscfp[s]->index = s;
+    }
+
     if (ngx_rtmp_init_event_handlers(cf, cmcf) != NGX_OK) {
         return NGX_CONF_ERROR;
     }

ngx_rtmp.h

@@ -464,6 +464,8 @@ struct ngx_rtmp_core_srv_conf_s {
 
     ngx_array_t             applications; /* ngx_rtmp_core_app_conf_t */
 
+    ngx_uint_t              index; /* index in server array */
+
     ngx_msec_t              timeout;
     ngx_msec_t              ping;
     ngx_msec_t              ping_timeout;
@@ -496,6 +498,8 @@ struct ngx_rtmp_core_srv_conf_s {
 #if (NGX_PCRE)
     unsigned                captures:1;
 #endif
+
+    in_port_t               port;
 };
 
 

ngx_rtmp_core_module.c

@@ -629,6 +629,8 @@ ngx_rtmp_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         if (ngx_rtmp_add_listen(cf, cscf, &lsopt) != NGX_OK) {
             return NGX_CONF_ERROR;
         }
+
+        cscf->port = 1935;
     }
 
     return rv;
@@ -1382,6 +1384,8 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
+    cscf->port = u.port;
+
     if (ngx_rtmp_add_listen(cf, cscf, &lsopt) == NGX_OK) {
         return NGX_CONF_OK;
     }

ngx_rtmp_stat_module.c

@@ -1003,14 +1003,23 @@ ngx_rtmp_stat_play(ngx_http_request_t *r, ngx_chain_t ***lll,
 
 static void
 ngx_rtmp_stat_application(ngx_http_request_t *r, ngx_chain_t ***lll,
-        ngx_rtmp_core_app_conf_t *cacf)
+        ngx_rtmp_core_srv_conf_t *cscf, ngx_rtmp_core_app_conf_t *cacf)
 {
+    u_char                          buf[NGX_INT_T_LEN];
     ngx_rtmp_stat_loc_conf_t       *slcf;
 
     slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module);
 
     if (slcf->format & NGX_RTMP_STAT_FORMAT_XML) {
         NGX_RTMP_STAT_L("<application>\r\n");
+        NGX_RTMP_STAT_L("<port>");
+        NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                      "%ui", cscf->port) - buf);
+        NGX_RTMP_STAT_L("</port>\r\n");
+        NGX_RTMP_STAT_L("<server_index>");
+        NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                      "%ui", cscf->index) - buf);
+        NGX_RTMP_STAT_L("</server_index>\r\n");
         NGX_RTMP_STAT_L("<name>");
         NGX_RTMP_STAT_ES(&cacf->name);
         NGX_RTMP_STAT_L("</name>\r\n");
@@ -1070,7 +1079,7 @@ ngx_rtmp_stat_server(ngx_http_request_t *r, ngx_chain_t ***lll,
 
     cacf = cscf->applications.elts;
     for (n = 0; n < cscf->applications.nelts; ++n, ++cacf) {
-        ngx_rtmp_stat_application(r, lll, *cacf);
+        ngx_rtmp_stat_application(r, lll, cscf, *cacf);
 
         if (slcf->format & NGX_RTMP_STAT_FORMAT_JSON &&
             n < cscf->applications.nelts - 1)

stat.xsl

@@ -135,7 +135,7 @@
         <td>
             <a href="">
                 <xsl:attribute name="onclick">
-                    var d=document.getElementById('<xsl:value-of select="../../name"/>-<xsl:value-of select="name"/>');
+                    var d=document.getElementById('<xsl:value-of select="../../port"/>-<xsl:value-of select="../../server_index"/>-<xsl:value-of select="../../name"/>-<xsl:value-of select="name"/>');
                     d.style.display=d.style.display=='none'?'':'none';
                     return false
                 </xsl:attribute>
@@ -211,7 +211,7 @@
     </tr>
     <tr style="display:none">
         <xsl:attribute name="id">
-            <xsl:value-of select="../../name"/>-<xsl:value-of select="name"/>
+            <xsl:value-of select="../../port"/>-<xsl:value-of select="../../server_index"/>-<xsl:value-of select="../../name"/>-<xsl:value-of select="name"/>
         </xsl:attribute>
         <td colspan="16" ngcolor="#eeeeee">
             <table cellspacing="1" cellpadding="5">