Mercurial > hg > nginx

changeset 6519:9ac934dd5dd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HTTP/2: skip data frames in case of internal errors. This prevents possible processing of such frames and triggering rb->post_handler if an error occurred during r->request_body initialization.
author Valentin Bartenev <vbart@nginx.com>
date Tue, 19 Apr 2016 17:38:49 +0300
parents 7760b54d5458
children 9070ba416284
files src/http/v2/ngx_http_v2.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -3473,6 +3473,7 @@ ngx_http_v2_read_request_body(ngx_http_r
     }
 
     if (rb->buf == NULL) {
+        stream->skip_data = 1;
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
@@ -3494,6 +3495,7 @@ ngx_http_v2_read_request_body(ngx_http_r
                                            stream->recv_window)
             == NGX_ERROR)
         {
+            stream->skip_data = 1;
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
     }