summaryrefslogtreecommitdiffhomepage
path: root/src/os/unix/ngx_files.c
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2011-12-13 18:34:34 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2011-12-13 18:34:34 +0000
commit80824feaff59e36798a8317a9e82fdc379d4a359 (patch)
tree708203337c7f3eb4820e73a81df31b5e3ef9707d /src/os/unix/ngx_files.c
parent5d45af698c8a4924616f5a6ce2f5742a18f84217 (diff)
downloadnginx-80824feaff59e36798a8317a9e82fdc379d4a359.tar.gz
nginx-80824feaff59e36798a8317a9e82fdc379d4a359.tar.bz2
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.
Diffstat (limited to 'src/os/unix/ngx_files.c')
0 files changed, 0 insertions, 0 deletions