Latest update - 7355

This commit is contained in:
2018-09-22 01:04:12 +09:00
parent 208765973a
commit 1134c4cd6e
3 changed files with 41 additions and 37 deletions
+14 -4
View File
@@ -2683,11 +2683,13 @@ error:
if (rc == NGX_ABORT) {
/* header handler has already finalized request */
ngx_http_run_posted_requests(fc);
return NULL;
}
if (rc == NGX_DECLINED) {
ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
ngx_http_run_posted_requests(fc);
return NULL;
}
@@ -3752,18 +3754,22 @@ ngx_http_v2_construct_cookie_header(ngx_http_request_t *r)
static void
ngx_http_v2_run_request(ngx_http_request_t *r)
{
ngx_connection_t *fc;
fc = r->connection;
if (ngx_http_v2_construct_request_line(r) != NGX_OK) {
return;
goto failed;
}
if (ngx_http_v2_construct_cookie_header(r) != NGX_OK) {
return;
goto failed;
}
r->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
if (ngx_http_process_request_header(r) != NGX_OK) {
return;
goto failed;
}
if (r->headers_in.content_length_n > 0 && r->stream->in_closed) {
@@ -3773,7 +3779,7 @@ ngx_http_v2_run_request(ngx_http_request_t *r)
r->stream->skip_data = 1;
ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
return;
goto failed;
}
if (r->headers_in.content_length_n == -1 && !r->stream->in_closed) {
@@ -3781,6 +3787,10 @@ ngx_http_v2_run_request(ngx_http_request_t *r)
}
ngx_http_process_request(r);
failed:
ngx_http_run_posted_requests(fc);
}