restore discard body handler after ngx_http_set_writer() set it to

ngx_http_test_reading(), the bug was introduced in r3050

diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
index 5519a5b852863e8533f0246e9d699c84daaf05ab..c165491dce1d883e77dc19d5af9629bde5094fc1 100644 (file)
--- a/src/http/ngx_http.h
+++ b/src/http/ngx_http.h
@@ -118,6 +118,7 @@ size_t ngx_http_get_time(char *buf, time_t t);
 
 
 ngx_int_t ngx_http_discard_request_body(ngx_http_request_t *r);
+void ngx_http_discarded_request_body_handler(ngx_http_request_t *r);
 void ngx_http_block_reading(ngx_http_request_t *r);
 void ngx_http_test_reading(ngx_http_request_t *r);
 

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 485a564695ca55365f973f1508016dec55e3a6d6..bad89a4aaa6229c1b2c996cf63abf7ba2d9d6a79 100644 (file)
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2105,10 +2105,15 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
 
     if (r->main->count != 1) {
 
-        if (r->discard_body && r->lingering_time == 0) {
-            r->lingering_time = ngx_time()
+        if (r->discard_body) {
+            r->read_event_handler = ngx_http_discarded_request_body_handler;
+            r->write_event_handler = ngx_http_request_empty_handler;
+
+            if (r->lingering_time == 0) {
+                r->lingering_time = ngx_time()
                                       + (time_t) (clcf->lingering_time / 1000);
-            ngx_add_timer(r->connection->read, clcf->lingering_timeout);
+                ngx_add_timer(r->connection->read, clcf->lingering_timeout);
+            }
         }
 
         ngx_http_close_request(r, 0);

diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index 62c962db7c22caf3241dafb95f605187a2ce31c0..be311a6129f7c75c485d00d5db34c3269238620c 100644 (file)
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -13,7 +13,6 @@ static void ngx_http_read_client_request_body_handler(ngx_http_request_t *r);
 static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r);
 static ngx_int_t ngx_http_write_request_body(ngx_http_request_t *r,
     ngx_chain_t *body);
-static void ngx_http_read_discarded_request_body_handler(ngx_http_request_t *r);
 static ngx_int_t ngx_http_read_discarded_request_body(ngx_http_request_t *r);
 static ngx_int_t ngx_http_test_expect(ngx_http_request_t *r);
 
@@ -470,7 +469,7 @@ ngx_http_discard_request_body(ngx_http_request_t *r)
         }
     }
 
-    r->read_event_handler = ngx_http_read_discarded_request_body_handler;
+    r->read_event_handler = ngx_http_discarded_request_body_handler;
 
     if (ngx_handle_read_event(rev, 0) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
@@ -488,8 +487,8 @@ ngx_http_discard_request_body(ngx_http_request_t *r)
 }
 
 
-static void
-ngx_http_read_discarded_request_body_handler(ngx_http_request_t *r)
+void
+ngx_http_discarded_request_body_handler(ngx_http_request_t *r)
 {
     ngx_int_t                  rc;
     ngx_msec_t                 timer;