From f7f963d7792fdf19ad11888d3a3e7460ea88dfd0 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 26 Oct 2009 15:54:29 +0000 Subject: merge r2903, r2911, r2912, r3002: fix various failures handling --- src/http/modules/ngx_http_memcached_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/http/modules/ngx_http_memcached_module.c') diff --git a/src/http/modules/ngx_http_memcached_module.c b/src/http/modules/ngx_http_memcached_module.c index f68be1e44..e613a2079 100644 --- a/src/http/modules/ngx_http_memcached_module.c +++ b/src/http/modules/ngx_http_memcached_module.c @@ -513,7 +513,7 @@ ngx_http_memcached_create_loc_conf(ngx_conf_t *cf) conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_memcached_loc_conf_t)); if (conf == NULL) { - return NGX_CONF_ERROR; + return NULL; } /* -- cgit