[PATCH] http_request: fix a segmentation fault

[Kirill A. Korinskiy]

If ngx_list_init/ngx_pcalloc/ngx_pcalloc return a NGX_ERROR nginx have
a segmentation fault, because r->main and r->variables have a NULL
---
 src/http/ngx_http_request.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index c9c6db7..080253c 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -449,13 +449,13 @@ ngx_http_init_request(ngx_event_t *rev)
                       sizeof(ngx_table_elt_t))
         != NGX_OK)
     {
-        ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        ngx_http_close_connection(c);
         return;
     }
 
     r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module);
     if (r->ctx == NULL) {
-        ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        ngx_http_close_connection(c);
         return;
     }
 
@@ -464,7 +464,7 @@ ngx_http_init_request(ngx_event_t *rev)
     r->variables = ngx_pcalloc(r->pool, cmcf->variables.nelts
                                         * sizeof(ngx_http_variable_value_t));
     if (r->variables == NULL) {
-        ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        ngx_http_close_connection(c);
         return;
     }
 
-- 
1.6.2


--Multipart_Tue_May_26_22:56:35_2009-1
Content-Type: text/plain; charset=US-ASCII



-- 
wbr, Kirill
--Multipart_Tue_May_26_22:56:35_2009-1--