diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-10-04 10:35:33 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2005-10-04 10:35:33 +0000 |
| commit | 3d5736770305c42dd10030969b18107abd2ae36a (patch) | |
| tree | d4de10e58322f224bd3d2310d875b568b88fcfcb /src/http/ngx_http_request.c | |
| parent | feec6759eab3fa301e1695038c95c608e4b16c1c (diff) | |
| download | nginx-0.2.5.tar.gz | |
Changes with nginx 0.2.5 04 Oct 2005v0.2.5
*) Change: the duplicate value of the ngx_http_geo_module variable now
causes the warning and changes old value.
*) Feature: the ngx_http_ssi_module supports the "set" command.
*) Feature: the ngx_http_ssi_module supports the "file" parameter in
the "include" command.
*) Feature: the ngx_http_ssi_module supports the variable value
substitutions in epxiressions of the "if" command.
Diffstat (limited to 'src/http/ngx_http_request.c')
| -rw-r--r-- | src/http/ngx_http_request.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 0e6613b51..704d373b6 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -423,6 +423,8 @@ void ngx_http_init_request(ngx_event_t *rev) c->single_connection = 1; r->connection = c; + r->main = r; + r->start_time = ngx_time(); r->headers_in.content_length_n = -1; @@ -1666,8 +1668,7 @@ ngx_http_writer(ngx_http_request_t *r) wev->delayed = 0; if (!wev->ready) { - clcf = ngx_http_get_module_loc_conf(r->main ? r->main : r, - ngx_http_core_module); + clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module); ngx_add_timer(wev, clcf->send_timeout); if (ngx_handle_write_event(wev, clcf->send_lowat) == NGX_ERROR) { @@ -1683,8 +1684,7 @@ ngx_http_writer(ngx_http_request_t *r) ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, "http writer delayed"); - clcf = ngx_http_get_module_loc_conf(r->main ? r->main : r, - ngx_http_core_module); + clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module); if (ngx_handle_write_event(wev, clcf->send_lowat) == NGX_ERROR) { ngx_http_close_request(r, 0); @@ -1712,8 +1712,7 @@ ngx_http_writer(ngx_http_request_t *r) "http writer output filter: %d, \"%V\"", rc, &r->uri); if (rc == NGX_AGAIN) { - clcf = ngx_http_get_module_loc_conf(r->main ? r->main : r, - ngx_http_core_module); + clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module); if (!wev->ready && !wev->delayed) { ngx_add_timer(wev, clcf->send_timeout); } @@ -1809,7 +1808,7 @@ ngx_http_discard_body(ngx_http_request_t *r) ssize_t size; ngx_event_t *rev; - if (r->main) { + if (r->main != r) { return NGX_OK; } |