From 5ac59c235d71c506619e10a77827efb7ca87e157 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 6 Aug 2012 17:20:01 +0000 Subject: [PATCH] Merge of r4766, r4767: ngx_http_upstream_add() changes. *) Fixed to return NULL if an error occurs. *) Microoptimization: replaced an expression known to be constant with the constant value. --- src/http/ngx_http_upstream.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 3730a2026..2cbb2cb93 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -4422,18 +4422,18 @@ 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)); us->addrs = u->addrs; - us->naddrs = u->naddrs; + us->naddrs = 1; } uscfp = ngx_array_push(&umcf->upstreams);