Mercurial > hg > nginx
view src/misc/ngx_cpp_test_module.cpp @ 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 | 69ef10ad7011 |
children | 4c36e15651f7 |
line wrap: on
line source
// stub module to test header files' C++ compatibilty extern "C" { #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> #include <ngx_event_connect.h> #include <ngx_event_pipe.h> #include <ngx_http.h> #include <ngx_mail.h> #include <ngx_mail_pop3_module.h> #include <ngx_mail_imap_module.h> #include <ngx_mail_smtp_module.h> } // nginx header files should go before other, because they define 64-bit off_t // #include <string> void ngx_cpp_test_handler(void *data) { return; }