Mercurial > hg > nginx-quic
comparison src/http/ngx_http_request_body.c @ 3214:798a7f1d3b2f
restore discard body handler after ngx_http_set_writer() set it to
ngx_http_test_reading(), the bug was introduced in r3050
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 19 Oct 2009 16:12:13 +0000 |
parents | 7fc06314c684 |
children | e56c1e9873cb 795761886688 |
comparison
equal
deleted
inserted
replaced
3213:7fc06314c684 | 3214:798a7f1d3b2f |
---|---|
11 | 11 |
12 static void ngx_http_read_client_request_body_handler(ngx_http_request_t *r); | 12 static void ngx_http_read_client_request_body_handler(ngx_http_request_t *r); |
13 static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r); | 13 static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r); |
14 static ngx_int_t ngx_http_write_request_body(ngx_http_request_t *r, | 14 static ngx_int_t ngx_http_write_request_body(ngx_http_request_t *r, |
15 ngx_chain_t *body); | 15 ngx_chain_t *body); |
16 static void ngx_http_read_discarded_request_body_handler(ngx_http_request_t *r); | |
17 static ngx_int_t ngx_http_read_discarded_request_body(ngx_http_request_t *r); | 16 static ngx_int_t ngx_http_read_discarded_request_body(ngx_http_request_t *r); |
18 static ngx_int_t ngx_http_test_expect(ngx_http_request_t *r); | 17 static ngx_int_t ngx_http_test_expect(ngx_http_request_t *r); |
19 | 18 |
20 | 19 |
21 /* | 20 /* |
468 r->headers_in.content_length_n = 0; | 467 r->headers_in.content_length_n = 0; |
469 return NGX_OK; | 468 return NGX_OK; |
470 } | 469 } |
471 } | 470 } |
472 | 471 |
473 r->read_event_handler = ngx_http_read_discarded_request_body_handler; | 472 r->read_event_handler = ngx_http_discarded_request_body_handler; |
474 | 473 |
475 if (ngx_handle_read_event(rev, 0) != NGX_OK) { | 474 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
476 return NGX_HTTP_INTERNAL_SERVER_ERROR; | 475 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
477 } | 476 } |
478 | 477 |
486 | 485 |
487 return NGX_OK; | 486 return NGX_OK; |
488 } | 487 } |
489 | 488 |
490 | 489 |
491 static void | 490 void |
492 ngx_http_read_discarded_request_body_handler(ngx_http_request_t *r) | 491 ngx_http_discarded_request_body_handler(ngx_http_request_t *r) |
493 { | 492 { |
494 ngx_int_t rc; | 493 ngx_int_t rc; |
495 ngx_msec_t timer; | 494 ngx_msec_t timer; |
496 ngx_event_t *rev; | 495 ngx_event_t *rev; |
497 ngx_connection_t *c; | 496 ngx_connection_t *c; |