From d9c25cdf1944afe8828a30a2ad89ac1f30b21851 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Wed, 30 Apr 2014 02:16:21 +0400 Subject: [PATCH] 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. --- src/http/ngx_http_spdy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c index a09e4ac0b..059adc977 100644 --- 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_http_request_t *r) 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; }