Mercurial > hg > nginx

comparison src/http/ngx_http_request_body.c @ 8647:507da0d3b070 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with the default branch.
author Sergey Kandaurov <pluknet@nginx.com>
date Tue, 24 Nov 2020 17:19:40 +0000
parents 279ad36f2f4b 967cfa6e2ff8
children 6bd8ed493b85
comparison
equal deleted inserted replaced
8646:4bf332873a83 8647:507da0d3b070
135 } 135 }
136 136
137 } else { 137 } else {
138 /* set rb->rest */ 138 /* set rb->rest */
139 139
140 if (ngx_http_request_body_filter(r, NULL) != NGX_OK) { 140 rc = ngx_http_request_body_filter(r, NULL);
141 rc = NGX_HTTP_INTERNAL_SERVER_ERROR; 141
142 if (rc != NGX_OK) {
142 goto done; 143 goto done;
143 } 144 }
144 } 145 }
145 146
146 if (rb->rest == 0) { 147 if (rb->rest == 0) {
303 } 304 }
304 305
305 return NGX_AGAIN; 306 return NGX_AGAIN;
306 } 307 }
307 308
309 ngx_log_error(NGX_LOG_ALERT, c->log, 0,
310 "busy buffers after request body flush");
311
308 return NGX_HTTP_INTERNAL_SERVER_ERROR; 312 return NGX_HTTP_INTERNAL_SERVER_ERROR;
309 } 313 }
310 314
311 rb->buf->pos = rb->buf->start; 315 rb->buf->pos = rb->buf->start;
312 rb->buf->last = rb->buf->start; 316 rb->buf->last = rb->buf->start;
677 rc = ngx_http_read_discarded_request_body(r); 681 rc = ngx_http_read_discarded_request_body(r);
678 682
679 if (rc == NGX_OK) { 683 if (rc == NGX_OK) {
680 r->discard_body = 0; 684 r->discard_body = 0;
681 r->lingering_close = 0; 685 r->lingering_close = 0;
686 r->lingering_time = 0;
682 ngx_http_finalize_request(r, NGX_DONE); 687 ngx_http_finalize_request(r, NGX_DONE);
683 return; 688 return;
684 } 689 }
685 690
686 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) { 691 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {