[fix] fix #115 when 'chunked_transfer_encoding' was on.

Author: winshining

README.CN.md

@@ -247,12 +247,13 @@ nginx-http-flv-module包含了[nginx-rtmp-module](https://github.com/arut/nginx-
 
 最好将配置项`worker_processes`设置为1，因为在多进程模式下，`ngx_rtmp_stat_module`可能不会从指定的worker进程获取统计数据，因为HTTP请求是被随机分配给worker进程的。`ngx_rtmp_control_module`也有同样的问题。这个问题可以通过这个补丁[per-worker-listener](https://github.com/arut/nginx-patches/blob/master/per-worker-listener)优化。
 
-另外，`vhost`功能在多进程模式下还不能完全正确运行，等待修复。例如，下面的配置在多进程模式下是没有问题的：
+另外，`vhost`功能在多进程模式下还不能完全正确运行，等待修复。例如，不管向哪个域名推流，下面的配置在多进程模式下是没有问题的：
 
     rtmp {
         ...
         server {
             listen 1935;
+            server_name 1st_domain_name;
 
             application myapp {
                 ...
@@ -261,7 +262,7 @@ nginx-http-flv-module包含了[nginx-rtmp-module](https://github.com/arut/nginx-
 
         server {
             listen 1935;
-            server_name localhost;
+            server_name 2nd_domain_name;
 
             application myapp {
                 ...
@@ -275,6 +276,7 @@ nginx-http-flv-module包含了[nginx-rtmp-module](https://github.com/arut/nginx-
         ...
         server {
             listen 1935;
+            server_name 1st_domain_name;
 
             application myapp {
                 ...
@@ -283,7 +285,7 @@ nginx-http-flv-module包含了[nginx-rtmp-module](https://github.com/arut/nginx-
 
         server {
             listen 1945;
-            server_name localhost;
+            server_name 2nd_domain_name;
 
             application myapp {
                 ...

README.md

@@ -247,12 +247,13 @@ The directives `rtmp_auto_push`, `rtmp_auto_push_reconnect` and `rtmp_socket_dir
 
 It's better to specify the directive `worker_processes` as 1, because `ngx_rtmp_stat_module` may not get statistics from a specified worker process in multi-processes mode, for HTTP requests are randomly distributed to worker processes. `ngx_rtmp_control_module` has the same problem. The problem can be optimized by this patch [per-worker-listener](https://github.com/arut/nginx-patches/blob/master/per-worker-listener).
 
-In addtion, `vhost` feature is not perfect in multi-processes mode yet, waiting to be fixed. For example, the following configuration is OK in multi-processes mode:
+In addtion, `vhost` feature is not perfect in multi-processes mode yet, waiting to be fixed. For example, whichever domain name streams are pushed to, the following configuration is OK in multi-processes mode:
 
     rtmp {
         ...
         server {
             listen 1935;
+            server_name 1st_domain_name;
 
             application myapp {
                 ...
@@ -261,7 +262,7 @@ In addtion, `vhost` feature is not perfect in multi-processes mode yet, waiting
 
         server {
             listen 1935;
-            server_name localhost;
+            server_name 2nd_domain_name;
 
             application myapp {
                 ...
@@ -275,6 +276,7 @@ While the following configuration doesn't work for play requests distinated to t
         ...
         server {
             listen 1935;
+            server_name 1st_domain_name;
 
             application myapp {
                 ...
@@ -283,7 +285,7 @@ While the following configuration doesn't work for play requests distinated to t
 
         server {
             listen 1945;
-            server_name localhost;
+            server_name 2nd_domain_name;
 
             application myapp {
                 ...

ngx_http_flv_live_module.c

@@ -203,6 +203,8 @@ static void ngx_http_flv_live_free_request(ngx_rtmp_session_t *s);
 
 static void ngx_http_flv_live_read_handler(ngx_event_t *rev);
 static void ngx_http_flv_live_write_handler(ngx_event_t *wev);
+
+static ngx_int_t ngx_http_flv_live_send(ngx_rtmp_session_t *s);
 static void ngx_http_flv_live_correct_timestamp(ngx_rtmp_session_t *s,
     ngx_flag_t correct);
 
@@ -1522,15 +1524,11 @@ ngx_http_flv_live_write_handler(ngx_event_t *wev)
 
     if (s->out_chain == NULL && s->out_pos != s->out_last) {
         s->out_chain = s->out[s->out_pos];
-        ngx_http_flv_live_correct_timestamp(s, 1);
         s->out_bpos = s->out_chain->buf->pos;
-    } else if (s->out_chain) {
-        ngx_http_flv_live_correct_timestamp(s, 1);
     }
 
     while (s->out_chain) {
-        n = c->send(c, s->out_bpos, s->out_chain->buf->last - s->out_bpos);
-        ngx_http_flv_live_correct_timestamp(s, 0);
+        n = ngx_http_flv_live_send(s);
 
         if (n == NGX_AGAIN || n == 0) {
             ngx_add_timer(c->write, s->timeout);
@@ -1562,7 +1560,6 @@ ngx_http_flv_live_write_handler(ngx_event_t *wev)
                     break;
                 }
                 s->out_chain = s->out[s->out_pos];
-                ngx_http_flv_live_correct_timestamp(s, 1);
             }
             s->out_bpos = s->out_chain->buf->pos;
         }
@@ -1576,41 +1573,67 @@ ngx_http_flv_live_write_handler(ngx_event_t *wev)
 }
 
 
+static ngx_int_t
+ngx_http_flv_live_send(ngx_rtmp_session_t *s)
+{
+    ngx_int_t            n;
+    ngx_connection_t    *c;
+    ngx_http_request_t  *r;
+
+    c = s->connection;
+    r = s->data;
+
+    if (r->chunked) {
+        if (s->out_chain == s->out[s->out_pos]) {
+            n = c->send(c, s->out_bpos, s->out_chain->buf->last - s->out_bpos);
+            if (n == NGX_AGAIN || n == 0 || n < 0) {
+                return n;
+            }
+
+            if (n != s->out_chain->buf->last - s->out_bpos ||
+                s->out_chain->next == NULL)
+            {
+                return n;
+            }
+
+            s->out_chain = s->out_chain->next;
+
+            s->out_bytes += n;
+            s->out_bpos = s->out_chain->buf->pos;
+            s->ping_reset = 1;
+            ngx_rtmp_update_bandwidth(&ngx_rtmp_bw_out, n);
+        }
+    }
+
+    ngx_http_flv_live_correct_timestamp(s, 1);
+    n = c->send(c, s->out_bpos, s->out_chain->buf->last - s->out_bpos);
+    ngx_http_flv_live_correct_timestamp(s, 0);
+
+    return n;
+}
+
+
 static void
 ngx_http_flv_live_correct_timestamp(ngx_rtmp_session_t *s, ngx_flag_t correct)
 {
-    uint8_t              type;
-    uint32_t             timestamp;
-    u_char              *p, *pt;
-    ngx_chain_t         *cl;
-    ngx_buf_t           *b;
-    ngx_http_request_t  *r;
+    uint8_t       type;
+    uint32_t      timestamp;
+    u_char       *p, *pt;
+    ngx_chain_t  *cl;
+    ngx_buf_t    *b;
 
     cl = s->out_chain;
     if (cl == NULL) {
         return;
     }
 
-    if (cl != s->out[s->out_pos]) {
-        return;
-    }
-
-    r = s->data;
-    if (r->chunked) {
-        cl = cl->next;
-        if (cl == NULL) {
-            return;
-        }
-    }
-
     b = cl->buf;
     if (b->start + NGX_RTMP_MAX_CHUNK_HEADER != b->pos) {
         type = b->pos[0] & 0x1f;
 
-        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
-                       "flv live: type=%uD, chunked=%uD, "
-                       "correct=%uD, offset_timestamp=%uD",
-                       type, r->chunked, correct, s->offset_timestamp);
+        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
+                       "flv live: type=%uD, correct=%uD, offset_timestamp=%uD",
+                       type, correct, s->offset_timestamp);
 
         if (type != NGX_RTMP_MSG_VIDEO && type != NGX_RTMP_MSG_AUDIO) {
             return;