Mercurial > hg > nginx

changeset 5686:5cf537731218

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SPDY: fixed one case of improper memory allocation error handling. Now ngx_http_spdy_construct_request_line() doesn't try to finalize request in case of failed memory allocation.
author Valentin Bartenev <vbart@nginx.com>
date Wed, 30 Apr 2014 02:16:21 +0400
parents 0cbefdcf82a6
children 6642690698f1
files src/http/ngx_http_spdy.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_spdy.c
+++ b/src/http/ngx_http_spdy.c
@@ -2900,7 +2900,8 @@ ngx_http_spdy_construct_request_line(ngx
 
     p = ngx_pnalloc(r->pool, r->request_line.len + 1);
     if (p == NULL) {
-        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        ngx_http_spdy_close_stream(r->spdy_stream,
+                                   NGX_HTTP_INTERNAL_SERVER_ERROR);
         return NGX_ERROR;
     }