Mercurial > hg > nginx
comparison src/event/ngx_event_mutex.c @ 4349:e04fdb54dd71 stable-1.0
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 13 Dec 2011 18:34:34 +0000 |
parents | a88a3e4e158f |
children | d620f497c50f |
comparison
equal
deleted
inserted
replaced
4348:6af89b1b16e8 | 4349:e04fdb54dd71 |
---|