From f7f963d7792fdf19ad11888d3a3e7460ea88dfd0 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 26 Oct 2009 15:54:29 +0000
Subject: merge r2903, r2911, r2912, r3002:

fix various failures handling
---
 src/http/ngx_http_upstream.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/http/ngx_http_upstream.c')

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 8c7f9a473..53b046ed1 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -4274,7 +4274,7 @@ ngx_http_upstream_create_main_conf(ngx_conf_t *cf)
                        sizeof(ngx_http_upstream_srv_conf_t *))
         != NGX_OK)
     {
-        return NGX_CONF_ERROR;
+        return NULL;
     }
 
     return umcf;
-- 
cgit