diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 15:54:29 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 15:54:29 +0000 |
| commit | f7f963d7792fdf19ad11888d3a3e7460ea88dfd0 (patch) | |
| tree | 33fa551ca1e0e3d61474dad1bf148de45338b7b7 /src/http/ngx_http_upstream.c | |
| parent | df30d3db5655ce895726efd7ddff81f971727dbe (diff) | |
| download | nginx-f7f963d7792fdf19ad11888d3a3e7460ea88dfd0.tar.gz nginx-f7f963d7792fdf19ad11888d3a3e7460ea88dfd0.tar.bz2 | |
merge r2903, r2911, r2912, r3002:
fix various failures handling
Diffstat (limited to 'src/http/ngx_http_upstream.c')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |