Mercurial > hg > nginx
annotate 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 |
rev | line source |
---|---|
2157 | 1 |
2 // stub module to test header files' C++ compatibilty | |
3 | |
4 extern "C" { | |
5 #include <ngx_config.h> | |
6 #include <ngx_core.h> | |
7 #include <ngx_event.h> | |
8 #include <ngx_event_connect.h> | |
9 #include <ngx_event_pipe.h> | |
10 | |
11 #include <ngx_http.h> | |
12 | |
13 #include <ngx_mail.h> | |
14 #include <ngx_mail_pop3_module.h> | |
15 #include <ngx_mail_imap_module.h> | |
16 #include <ngx_mail_smtp_module.h> | |
17 } | |
18 | |
19 // nginx header files should go before other, because they define 64-bit off_t | |
20 // #include <string> | |
21 | |
22 | |
23 void | |
24 ngx_cpp_test_handler(void *data) | |
25 { | |
26 return; | |
27 } |