comparison src/http/modules/ngx_http_map_module.c @ 3237:2efa8d2fcde1 stable-0.7

merge r2903, r2911, r2912, r3002: fix various failures handling
author Igor Sysoev <igor@sysoev.ru>
date Mon, 26 Oct 2009 15:54:29 +0000
parents a6d6d762c554
children 98e288c6dac3
comparison
equal deleted inserted replaced
3236:9aa8fd2d5a00 3237:2efa8d2fcde1
158 { 158 {
159 ngx_http_map_conf_t *mcf; 159 ngx_http_map_conf_t *mcf;
160 160
161 mcf = ngx_palloc(cf->pool, sizeof(ngx_http_map_conf_t)); 161 mcf = ngx_palloc(cf->pool, sizeof(ngx_http_map_conf_t));
162 if (mcf == NULL) { 162 if (mcf == NULL) {
163 return NGX_CONF_ERROR; 163 return NULL;
164 } 164 }
165 165
166 mcf->hash_max_size = NGX_CONF_UNSET_UINT; 166 mcf->hash_max_size = NGX_CONF_UNSET_UINT;
167 mcf->hash_bucket_size = NGX_CONF_UNSET_UINT; 167 mcf->hash_bucket_size = NGX_CONF_UNSET_UINT;
168 168