nginx: src/http/ngx_http_core_module.c comparison

merge r2903, r2911, r2912, r3002: fix various failures handling

comparison

equal deleted inserted replaced

-:9aa8fd2d5a00
+:2efa8d2fcde1
 {
 ngx_http_core_main_conf_t  *cmcf;
 cmcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_main_conf_t));
 if (cmcf == NULL) {
-return NGX_CONF_ERROR;
+return NULL;
 }
 if (ngx_array_init(&cmcf->servers, cf->pool, 4,
 sizeof(ngx_http_core_srv_conf_t *))
 != NGX_OK)
 {
-return NGX_CONF_ERROR;
+return NULL;
 }
 cmcf->server_names_hash_max_size = NGX_CONF_UNSET_UINT;
 cmcf->server_names_hash_bucket_size = NGX_CONF_UNSET_UINT;
 {
 ngx_http_core_srv_conf_t  *cscf;
 cscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_srv_conf_t));
 if (cscf == NULL) {
-return NGX_CONF_ERROR;
+return NULL;
 }
 /*
 * set by ngx_pcalloc():
 *
 if (ngx_array_init(&cscf->listen, cf->temp_pool, 4,
 sizeof(ngx_http_listen_t))
 != NGX_OK)
 {
-return NGX_CONF_ERROR;
+return NULL;
 }
 if (ngx_array_init(&cscf->server_names, cf->temp_pool, 4,
 sizeof(ngx_http_server_name_t))
 != NGX_OK)
 {
-return NGX_CONF_ERROR;
+return NULL;
 }
 cscf->connection_pool_size = NGX_CONF_UNSET_SIZE;
 cscf->request_pool_size = NGX_CONF_UNSET_SIZE;
 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC;
 {
 ngx_http_core_loc_conf_t  *lcf;
 lcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_loc_conf_t));
 if (lcf == NULL) {
-return NGX_CONF_ERROR;
+return NULL;
 }
 /*
 * set by ngx_pcalloc():
 *

Mercurial > hg > nginx