IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-22 15:13:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix "out of memory" case handling

Browse Source
This commit is contained in:
Igor Sysoev 2009-05-29 11:42:55 +00:00
parent 6da803a6be
commit 8416832621
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/http/ngx_http_request.c
View File

@ -451,13 +451,15 @@ ngx_http_init_request(ngx_event_t *rev)
sizeof(ngx_table_elt_t)) sizeof(ngx_table_elt_t))
!= NGX_OK) != NGX_OK)
{ {
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); ngx_destroy_pool(r->pool);
ngx_http_close_connection(c);
return; return;
} }
r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module); r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module);
if (r->ctx == NULL) { if (r->ctx == NULL) {
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); ngx_destroy_pool(r->pool);
ngx_http_close_connection(c);
return; return;
} }
@ -466,7 +468,8 @@ ngx_http_init_request(ngx_event_t *rev)
r->variables = ngx_pcalloc(r->pool, cmcf->variables.nelts r->variables = ngx_pcalloc(r->pool, cmcf->variables.nelts
* sizeof(ngx_http_variable_value_t)); * sizeof(ngx_http_variable_value_t));
if (r->variables == NULL) { if (r->variables == NULL) {
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); ngx_destroy_pool(r->pool);
ngx_http_close_connection(c);
return; return;
} }