]> git.kaiwu.me - nginx.git/commit
Merge of r4153:
authorMaxim Dounin <mdounin@mdounin.ru>
Tue, 13 Dec 2011 18:34:34 +0000 (18:34 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Tue, 13 Dec 2011 18:34:34 +0000 (18:34 +0000)
commit80824feaff59e36798a8317a9e82fdc379d4a359
tree708203337c7f3eb4820e73a81df31b5e3ef9707d
parent5d45af698c8a4924616f5a6ce2f5742a18f84217
Merge of r4153:

Better handling of late upstream creation.

Configuration with duplicate upstream blocks defined after first use, i.e.
like

    server {
        ...
        location / {
            proxy_pass http://backend;
        }
    }

    upstream backend { ... }
    upstream backend { ... }

now correctly results in "duplicate upstream" error.

Additionally, upstream blocks defined after first use now handle various
server directive parameters ("weight", "max_fails", etc.).  Previously
configuration like

    server {
        ...
        location / {
            proxy_pass http://backend;
        }
    }

    upstream backend {
        server 127.0.0.1 max_fails=5;
    }

incorrectly resulted in "invalid parameter "max_fails=5"" error.
src/http/ngx_http_upstream.c