# HG changeset patch # User Maxim Dounin # Date 1243965199 -14400 # Node ID 2054159546d076aa7ad2ef2efa91410d344543d9 # Parent 142c6443d851ae0fd6926e2780fbc950dbd8579e Keepalive: fix create_conf to return NULL on errors. diff --git a/ngx_http_upstream_keepalive_module.c b/ngx_http_upstream_keepalive_module.c --- a/ngx_http_upstream_keepalive_module.c +++ b/ngx_http_upstream_keepalive_module.c @@ -409,7 +409,7 @@ ngx_http_upstream_keepalive_create_conf( conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_keepalive_srv_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /*