]> git.kaiwu.me - nginx.git/commitdiff
fix testing, the bug has been introduced in r3218
authorIgor Sysoev <igor@sysoev.ru>
Fri, 8 Oct 2010 11:42:05 +0000 (11:42 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Fri, 8 Oct 2010 11:42:05 +0000 (11:42 +0000)
src/http/ngx_http_core_module.c

index f6d22482f68146e476ae3bcb570f9ff5c00a4d4e..25adec28fd648f1271845d4138946e61e0628ef3 100644 (file)
@@ -3005,8 +3005,8 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         (void) ngx_sock_ntop(&lsopt.u.sockaddr, lsopt.addr,
                              NGX_SOCKADDR_STRLEN, 1);
 
-        if (ngx_http_add_listen(cf, conf, &lsopt) == NGX_OK) {
-            return NGX_CONF_OK;
+        if (ngx_http_add_listen(cf, conf, &lsopt) != NGX_OK) {
+            return NGX_CONF_ERROR;
         }
     }