]> git.kaiwu.me - nginx.git/commitdiff
ngx_http_upstream_add() should return NULL if an error occurs.
authorRuslan Ermilov <ru@nginx.com>
Sun, 29 Jul 2012 19:38:25 +0000 (19:38 +0000)
committerRuslan Ermilov <ru@nginx.com>
Sun, 29 Jul 2012 19:38:25 +0000 (19:38 +0000)
src/http/ngx_http_upstream.c

index 3730a20262caac64bd9eb0b253dde2a10d425da1..9ad3981170d16c35c9c094a3e1916677a165f51b 100644 (file)
@@ -4422,12 +4422,12 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
         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));