comparison src/http/modules/ngx_http_stub_status_module.c @ 4659:f12d474f0d5e stable-1.2

Merge of r4612: proper subrequest handling in various modules.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 04 Jun 2012 10:27:00 +0000
parents d620f497c50f
children 1c472e3b8c10
comparison
equal deleted inserted replaced
4658:c92289afb5be 4659:f12d474f0d5e
119 rd, wr, ac - (rd + wr)); 119 rd, wr, ac - (rd + wr));
120 120
121 r->headers_out.status = NGX_HTTP_OK; 121 r->headers_out.status = NGX_HTTP_OK;
122 r->headers_out.content_length_n = b->last - b->pos; 122 r->headers_out.content_length_n = b->last - b->pos;
123 123
124 b->last_buf = 1; 124 b->last_buf = (r == r->main) ? 1 : 0;
125 125
126 rc = ngx_http_send_header(r); 126 rc = ngx_http_send_header(r);
127 127
128 if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) { 128 if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
129 return rc; 129 return rc;