comparison src/http/ngx_http_request_body.c @ 539:5f4de8cf0d9d

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 15 Sep 2009 03:43:40 +0400
parents 80f7156c2965
children 4c5d2c627a6c
comparison
equal deleted inserted replaced
522:40fd8d7b82f9 539:5f4de8cf0d9d
34 ngx_buf_t *b; 34 ngx_buf_t *b;
35 ngx_chain_t *cl, **next; 35 ngx_chain_t *cl, **next;
36 ngx_temp_file_t *tf; 36 ngx_temp_file_t *tf;
37 ngx_http_request_body_t *rb; 37 ngx_http_request_body_t *rb;
38 ngx_http_core_loc_conf_t *clcf; 38 ngx_http_core_loc_conf_t *clcf;
39
40 r->main->count++;
39 41
40 if (r->request_body || r->discard_body) { 42 if (r->request_body || r->discard_body) {
41 post_handler(r); 43 post_handler(r);
42 return NGX_OK; 44 return NGX_OK;
43 } 45 }
473 475
474 if (ngx_handle_read_event(rev, 0) != NGX_OK) { 476 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
475 return NGX_HTTP_INTERNAL_SERVER_ERROR; 477 return NGX_HTTP_INTERNAL_SERVER_ERROR;
476 } 478 }
477 479
480 r->count++;
478 (void) ngx_http_read_discarded_request_body(r); 481 (void) ngx_http_read_discarded_request_body(r);
479 482
480 return NGX_OK; 483 return NGX_OK;
481 } 484 }
482 485