Mercurial > hg > nginx
changeset 3237:2efa8d2fcde1 stable-0.7
merge r2903, r2911, r2912, r3002:
fix various failures handling
line wrap: on
line diff
--- a/src/core/ngx_cycle.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/core/ngx_cycle.c Mon Oct 26 15:54:29 2009 +0000 @@ -216,7 +216,7 @@ if (module->create_conf) { rv = module->create_conf(cycle); - if (rv == NGX_CONF_ERROR) { + if (rv == NULL) { ngx_destroy_pool(pool); return NULL; }
--- a/src/core/ngx_output_chain.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/core/ngx_output_chain.c Mon Oct 26 15:54:29 2009 +0000 @@ -314,12 +314,11 @@ #endif + cl->next = NULL; *ll = cl; ll = &cl->next; } - *ll = NULL; - return NGX_OK; }
--- a/src/event/modules/ngx_devpoll_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/event/modules/ngx_devpoll_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -550,7 +550,7 @@ dpcf = ngx_palloc(cycle->pool, sizeof(ngx_devpoll_conf_t)); if (dpcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } dpcf->changes = NGX_CONF_UNSET;
--- a/src/event/modules/ngx_epoll_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/event/modules/ngx_epoll_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -552,7 +552,7 @@ epcf = ngx_palloc(cycle->pool, sizeof(ngx_epoll_conf_t)); if (epcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } epcf->events = NGX_CONF_UNSET;
--- a/src/event/modules/ngx_eventport_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/event/modules/ngx_eventport_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -581,7 +581,7 @@ epcf = ngx_palloc(cycle->pool, sizeof(ngx_eventport_conf_t)); if (epcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } epcf->events = NGX_CONF_UNSET;
--- a/src/event/modules/ngx_kqueue_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/event/modules/ngx_kqueue_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -768,7 +768,7 @@ kcf = ngx_palloc(cycle->pool, sizeof(ngx_kqueue_conf_t)); if (kcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } kcf->changes = NGX_CONF_UNSET;
--- a/src/event/modules/ngx_rtsig_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/event/modules/ngx_rtsig_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -691,7 +691,7 @@ rtscf = ngx_palloc(cycle->pool, sizeof(ngx_rtsig_conf_t)); if (rtscf == NULL) { - return NGX_CONF_ERROR; + return NULL; } rtscf->signo = NGX_CONF_UNSET;
--- a/src/event/ngx_event.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/event/ngx_event.c Mon Oct 26 15:54:29 2009 +0000 @@ -1113,7 +1113,7 @@ ecf = ngx_palloc(cycle->pool, sizeof(ngx_event_conf_t)); if (ecf == NULL) { - return NGX_CONF_ERROR; + return NULL; } ecf->connections = NGX_CONF_UNSET_UINT; @@ -1128,7 +1128,7 @@ if (ngx_array_init(&ecf->debug_connection, cycle->pool, 4, sizeof(ngx_event_debug_t)) == NGX_ERROR) { - return NGX_CONF_ERROR; + return NULL; } #endif
--- a/src/event/ngx_event_openssl.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/event/ngx_event_openssl.c Mon Oct 26 15:54:29 2009 +0000 @@ -2115,7 +2115,7 @@ oscf = ngx_pcalloc(cycle->pool, sizeof(ngx_openssl_conf_t)); if (oscf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_access_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_access_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -201,7 +201,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_access_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } return conf;
--- a/src/http/modules/ngx_http_addition_filter_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_addition_filter_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -212,7 +212,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_addition_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_auth_basic_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_auth_basic_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -372,7 +372,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_auth_basic_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } return conf;
--- a/src/http/modules/ngx_http_autoindex_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_autoindex_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -632,7 +632,7 @@ conf = ngx_palloc(cf->pool, sizeof(ngx_http_autoindex_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } conf->enable = NGX_CONF_UNSET;
--- a/src/http/modules/ngx_http_browser_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_browser_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -423,7 +423,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_browser_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_charset_filter_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_charset_filter_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -1488,27 +1488,27 @@ mcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_charset_main_conf_t)); if (mcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } if (ngx_array_init(&mcf->charsets, cf->pool, 2, sizeof(ngx_http_charset_t)) != NGX_OK) { - return NGX_CONF_ERROR; + return NULL; } if (ngx_array_init(&mcf->tables, cf->pool, 1, sizeof(ngx_http_charset_tables_t)) != NGX_OK) { - return NGX_CONF_ERROR; + return NULL; } if (ngx_array_init(&mcf->recodes, cf->pool, 2, sizeof(ngx_http_charset_recode_t)) != NGX_OK) { - return NGX_CONF_ERROR; + return NULL; } return mcf; @@ -1522,7 +1522,7 @@ lcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_charset_loc_conf_t)); if (lcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_dav_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_dav_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -1154,7 +1154,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_dav_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_fastcgi_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_fastcgi_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -1836,7 +1836,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_fastcgi_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_gzip_filter_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_gzip_filter_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -1069,7 +1069,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_gzip_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_gzip_static_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_gzip_static_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -251,7 +251,7 @@ conf = ngx_palloc(cf->pool, sizeof(ngx_http_gzip_static_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } conf->enable = NGX_CONF_UNSET;
--- a/src/http/modules/ngx_http_headers_filter_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_headers_filter_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -421,7 +421,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_headers_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_image_filter_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_image_filter_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -948,7 +948,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_image_filter_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } conf->filter = NGX_CONF_UNSET_UINT;
--- a/src/http/modules/ngx_http_index_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_index_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -366,7 +366,7 @@ conf = ngx_palloc(cf->pool, sizeof(ngx_http_index_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } conf->indices = NULL;
--- a/src/http/modules/ngx_http_limit_req_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_limit_req_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -522,7 +522,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_limit_req_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_limit_zone_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_limit_zone_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -381,7 +381,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_limit_zone_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_log_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_log_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -714,18 +714,18 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_main_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } if (ngx_array_init(&conf->formats, cf->pool, 4, sizeof(ngx_http_log_fmt_t)) != NGX_OK) { - return NGX_CONF_ERROR; + return NULL; } fmt = ngx_array_push(&conf->formats); if (fmt == NULL) { - return NGX_CONF_ERROR; + return NULL; } fmt->name.len = sizeof("combined") - 1; @@ -735,7 +735,7 @@ fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_http_log_op_t)); if (fmt->ops == NULL) { - return NGX_CONF_ERROR; + return NULL; } return conf; @@ -749,7 +749,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } conf->open_file_cache = NGX_CONF_UNSET_PTR;
--- a/src/http/modules/ngx_http_map_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_map_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -160,7 +160,7 @@ mcf = ngx_palloc(cf->pool, sizeof(ngx_http_map_conf_t)); if (mcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } mcf->hash_max_size = NGX_CONF_UNSET_UINT;
--- a/src/http/modules/ngx_http_memcached_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_memcached_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -513,7 +513,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_memcached_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_proxy_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_proxy_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -1884,7 +1884,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_proxy_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_random_index_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_random_index_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -280,7 +280,7 @@ conf = ngx_palloc(cf->pool, sizeof(ngx_http_random_index_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } conf->enable = NGX_CONF_UNSET;
--- a/src/http/modules/ngx_http_realip_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_realip_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -360,7 +360,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_realip_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_referer_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_referer_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -221,7 +221,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_referer_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } #if (NGX_PCRE)
--- a/src/http/modules/ngx_http_rewrite_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_rewrite_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -220,7 +220,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_rewrite_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } conf->stack_size = NGX_CONF_UNSET_UINT; @@ -568,7 +568,7 @@ if_code = ngx_array_push_n(lcf->codes, sizeof(ngx_http_script_if_code_t)); if (if_code == NULL) { - return NULL; + return NGX_CONF_ERROR; } if_code->code = ngx_http_script_if_code;
--- a/src/http/modules/ngx_http_secure_link_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_secure_link_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -152,7 +152,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_secure_link_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_ssi_filter_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_ssi_filter_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -2689,14 +2689,14 @@ smcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssi_main_conf_t)); if (smcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } smcf->commands.pool = cf->pool; smcf->commands.temp_pool = cf->temp_pool; if (ngx_hash_keys_array_init(&smcf->commands, NGX_HASH_SMALL) != NGX_OK) { - return NGX_CONF_ERROR; + return NULL; } return smcf; @@ -2736,7 +2736,7 @@ slcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssi_loc_conf_t)); if (slcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_ssl_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_ssl_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -302,7 +302,7 @@ sscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_srv_conf_t)); if (sscf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_sub_filter_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_sub_filter_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -638,7 +638,7 @@ slcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_sub_loc_conf_t)); if (slcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_userid_filter_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_userid_filter_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -570,7 +570,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_userid_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/ngx_http_xslt_filter_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/ngx_http_xslt_filter_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -1172,7 +1172,7 @@ conf = ngx_palloc(cf->pool, sizeof(ngx_http_xslt_filter_main_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } if (ngx_array_init(&conf->dtd_files, cf->pool, 1, @@ -1200,7 +1200,7 @@ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_xslt_filter_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/modules/perl/ngx_http_perl_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/modules/perl/ngx_http_perl_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -784,7 +784,7 @@ pmcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_perl_main_conf_t)); if (pmcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } if (ngx_array_init(&pmcf->requires, cf->pool, 1, sizeof(u_char *)) @@ -869,7 +869,7 @@ plcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_perl_loc_conf_t)); if (plcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/ngx_http_core_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/ngx_http_core_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -2699,14 +2699,14 @@ 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; @@ -2758,7 +2758,7 @@ cscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_srv_conf_t)); if (cscf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /* @@ -2771,14 +2771,14 @@ 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; @@ -2889,7 +2889,7 @@ lcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_loc_conf_t)); if (lcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*
--- a/src/http/ngx_http_request.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/ngx_http_request.c Mon Oct 26 15:54:29 2009 +0000 @@ -451,13 +451,15 @@ sizeof(ngx_table_elt_t)) != NGX_OK) { - ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); + ngx_destroy_pool(r->pool); + 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_destroy_pool(r->pool); + ngx_http_close_connection(c); return; } @@ -466,7 +468,8 @@ 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_destroy_pool(r->pool); + ngx_http_close_connection(c); return; }
--- a/src/http/ngx_http_script.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/ngx_http_script.c Mon Oct 26 15:54:29 2009 +0000 @@ -561,7 +561,7 @@ new = ngx_array_push_n(codes, size); if (new == NULL) { - return NGX_CONF_ERROR; + return NULL; } if (code) {
--- a/src/http/ngx_http_upstream.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/http/ngx_http_upstream.c Mon Oct 26 15:54:29 2009 +0000 @@ -4274,7 +4274,7 @@ sizeof(ngx_http_upstream_srv_conf_t *)) != NGX_OK) { - return NGX_CONF_ERROR; + return NULL; } return umcf;
--- a/src/mail/ngx_mail_auth_http_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/mail/ngx_mail_auth_http_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -1302,7 +1302,7 @@ ahcf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_auth_http_conf_t)); if (ahcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } ahcf->timeout = NGX_CONF_UNSET_MSEC;
--- a/src/mail/ngx_mail_core_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/mail/ngx_mail_core_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -120,20 +120,20 @@ cmcf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_core_main_conf_t)); if (cmcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } if (ngx_array_init(&cmcf->servers, cf->pool, 4, sizeof(ngx_mail_core_srv_conf_t *)) != NGX_OK) { - return NGX_CONF_ERROR; + return NULL; } if (ngx_array_init(&cmcf->listen, cf->pool, 4, sizeof(ngx_mail_listen_t)) != NGX_OK) { - return NGX_CONF_ERROR; + return NULL; } return cmcf;
--- a/src/mail/ngx_mail_proxy_module.c Mon Oct 26 15:46:59 2009 +0000 +++ b/src/mail/ngx_mail_proxy_module.c Mon Oct 26 15:54:29 2009 +0000 @@ -1061,7 +1061,7 @@ pcf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_proxy_conf_t)); if (pcf == NULL) { - return NGX_CONF_ERROR; + return NULL; } pcf->enable = NGX_CONF_UNSET;