commit b1630108729e1f458a06622a474b51e533b34f1c
author Ruslan Ermilov <ru@nginx.com> Sun Jul 29 19:38:25 2012 +0000
committer Ruslan Ermilov <ru@nginx.com> Sun Jul 29 19:38:25 2012 +0000
tree cc173145716f6391328f92cb02d988637489cc04
parent 01f07bde7ea9cdc683864fe49d83d36cffa2caac

ngx_http_upstream_add() should return NULL if an error occurs.

src/http/ngx_http_upstream.c

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 3730a20..9ad3981 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -4422,12 +4422,12 @@
         uscf->servers = ngx_array_create(cf->pool, 1,
                                          sizeof(ngx_http_upstream_server_t));
         if (uscf->servers == NULL) {
-            return NGX_CONF_ERROR;
+            return NULL;
         }
 
         us = ngx_array_push(uscf->servers);
         if (us == NULL) {
-            return NGX_CONF_ERROR;
+            return NULL;
         }
 
         ngx_memzero(us, sizeof(ngx_http_upstream_server_t));