[nginx] svn commit: r4660 - in branches/stable-1.2: . src/http/modules

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-06-04 10:27:00 +0000 (Mon, 04 Jun 2012)
New Revision: 4660
URL: http://trac.nginx.org/nginx/changeset/4660/nginx

Log:
Merge of r4612: proper subrequest handling in various modules.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/modules/ngx_http_flv_module.c
   branches/stable-1.2/src/http/modules/ngx_http_gzip_static_module.c
   branches/stable-1.2/src/http/modules/ngx_http_mp4_module.c
   branches/stable-1.2/src/http/modules/ngx_http_stub_status_module.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-06-04 10:15:55 UTC (rev 4659)
+++ branches/stable-1.2	2012-06-04 10:27:00 UTC (rev 4660)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611,4620
+/trunk:4611-4612,4620
\ No newline at end of property
Modified: branches/stable-1.2/src/http/modules/ngx_http_flv_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_flv_module.c	2012-06-04 10:15:55 UTC (rev 4659)
+++ branches/stable-1.2/src/http/modules/ngx_http_flv_module.c	2012-06-04 10:27:00 UTC (rev 4660)
@@ -235,7 +235,7 @@
     b->file_last = of.size;
 
     b->in_file = b->file_last ? 1: 0;
-    b->last_buf = 1;
+    b->last_buf = (r == r->main) ? 1 : 0;
     b->last_in_chain = 1;
 
     b->file->fd = of.fd;

Modified: branches/stable-1.2/src/http/modules/ngx_http_gzip_static_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_gzip_static_module.c	2012-06-04 10:15:55 UTC (rev 4659)
+++ branches/stable-1.2/src/http/modules/ngx_http_gzip_static_module.c	2012-06-04 10:27:00 UTC (rev 4660)
@@ -245,7 +245,7 @@
     b->file_last = of.size;
 
     b->in_file = b->file_last ? 1 : 0;
-    b->last_buf = 1;
+    b->last_buf = (r == r->main) ? 1 : 0;
     b->last_in_chain = 1;
 
     b->file->fd = of.fd;

Modified: branches/stable-1.2/src/http/modules/ngx_http_mp4_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_mp4_module.c	2012-06-04 10:15:55 UTC (rev 4659)
+++ branches/stable-1.2/src/http/modules/ngx_http_mp4_module.c	2012-06-04 10:27:00 UTC (rev 4660)
@@ -616,7 +616,7 @@
     b->file_last = of.size;
 
     b->in_file = b->file_last ? 1 : 0;
-    b->last_buf = 1;
+    b->last_buf = (r == r->main) ? 1 : 0;
     b->last_in_chain = 1;
 
     b->file->fd = of.fd;

Modified: branches/stable-1.2/src/http/modules/ngx_http_stub_status_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_stub_status_module.c	2012-06-04 10:15:55 UTC (rev 4659)
+++ branches/stable-1.2/src/http/modules/ngx_http_stub_status_module.c	2012-06-04 10:27:00 UTC (rev 4660)
@@ -121,7 +121,7 @@
     r->headers_out.status = NGX_HTTP_OK;
     r->headers_out.content_length_n = b->last - b->pos;
 
-    b->last_buf = 1;
+    b->last_buf = (r == r->main) ? 1 : 0;
 
     rc = ngx_http_send_header(r);