Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.c @ 590:cde3626b2d0d NGINX_0_8_47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.47 *) Bugfix: $request_time variable had invalid values for subrequests. *) Bugfix: errors intercepted by error_page could be cached. *) Bugfix: a cache manager process my got caught in an endless loop, if max_size parameter was used; the bug had appeared in 0.8.46.
author Igor Sysoev <http://sysoev.ru>
date Wed, 28 Jul 2010 00:00:00 +0400
parents 53f5f04a64b8
children 09d5f308901f
comparison
equal deleted inserted replaced
589:5de4f69bbbab 590:cde3626b2d0d
2150 ngx_int_t 2150 ngx_int_t
2151 ngx_http_subrequest(ngx_http_request_t *r, 2151 ngx_http_subrequest(ngx_http_request_t *r,
2152 ngx_str_t *uri, ngx_str_t *args, ngx_http_request_t **psr, 2152 ngx_str_t *uri, ngx_str_t *args, ngx_http_request_t **psr,
2153 ngx_http_post_subrequest_t *ps, ngx_uint_t flags) 2153 ngx_http_post_subrequest_t *ps, ngx_uint_t flags)
2154 { 2154 {
2155 ngx_time_t *tp;
2155 ngx_connection_t *c; 2156 ngx_connection_t *c;
2156 ngx_http_request_t *sr; 2157 ngx_http_request_t *sr;
2157 ngx_http_core_srv_conf_t *cscf; 2158 ngx_http_core_srv_conf_t *cscf;
2158 ngx_http_postponed_request_t *pr, *p; 2159 ngx_http_postponed_request_t *pr, *p;
2159 2160
2261 sr->discard_body = r->discard_body; 2262 sr->discard_body = r->discard_body;
2262 sr->expect_tested = 1; 2263 sr->expect_tested = 1;
2263 sr->main_filter_need_in_memory = r->main_filter_need_in_memory; 2264 sr->main_filter_need_in_memory = r->main_filter_need_in_memory;
2264 2265
2265 sr->uri_changes = NGX_HTTP_MAX_URI_CHANGES + 1; 2266 sr->uri_changes = NGX_HTTP_MAX_URI_CHANGES + 1;
2267
2268 tp = ngx_timeofday();
2269 r->start_sec = tp->sec;
2270 r->start_msec = tp->msec;
2266 2271
2267 r->main->subrequests++; 2272 r->main->subrequests++;
2268 r->main->count++; 2273 r->main->count++;
2269 2274
2270 *psr = sr; 2275 *psr = sr;