[nginx] svn commit: r4612 - trunk/src/http/modules

[defan at nginx.com]

Author: defan
Date: 2012-04-26 13:06:27 +0000 (Thu, 26 Apr 2012)
New Revision: 4612
URL: http://trac.nginx.org/nginx/changeset/4612/nginx

Log:
Allows particular modules to handle subrequests properly.



Modified:
   trunk/src/http/modules/ngx_http_flv_module.c
   trunk/src/http/modules/ngx_http_gzip_static_module.c
   trunk/src/http/modules/ngx_http_mp4_module.c
   trunk/src/http/modules/ngx_http_stub_status_module.c

Modified: trunk/src/http/modules/ngx_http_flv_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_flv_module.c	2012-04-26 12:58:42 UTC (rev 4611)
+++ trunk/src/http/modules/ngx_http_flv_module.c	2012-04-26 13:06:27 UTC (rev 4612)
@@ -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: trunk/src/http/modules/ngx_http_gzip_static_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_gzip_static_module.c	2012-04-26 12:58:42 UTC (rev 4611)
+++ trunk/src/http/modules/ngx_http_gzip_static_module.c	2012-04-26 13:06:27 UTC (rev 4612)
@@ -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: trunk/src/http/modules/ngx_http_mp4_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_mp4_module.c	2012-04-26 12:58:42 UTC (rev 4611)
+++ trunk/src/http/modules/ngx_http_mp4_module.c	2012-04-26 13:06:27 UTC (rev 4612)
@@ -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: trunk/src/http/modules/ngx_http_stub_status_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_stub_status_module.c	2012-04-26 12:58:42 UTC (rev 4611)
+++ trunk/src/http/modules/ngx_http_stub_status_module.c	2012-04-26 13:06:27 UTC (rev 4612)
@@ -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);