Author: ru
Date: 2012-07-29 19:38:25 +0000 (Sun, 29 Jul 2012)
New Revision: 4766
URL: http://trac.nginx.org/nginx/changeset/4766/nginx

Log:
ngx_http_upstream_add() should return NULL if an error occurs.


Modified:
trunk/src/http/ngx_http_upstream.c

Modified: trunk/src/http/ngx_http_upstream.c
===================================================================
--- trunk/src/http/ngx_http_upstream.c 2012-07-26 14:47:42 UTC (rev 4765)
+++ trunk/src/http/ngx_http_upstream.c 2012-07-29 19:38:25 UTC (rev 4766)
@@ -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));

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel