Mercurial > hg > nginx
comparison src/core/ngx_conf_file.h @ 4803:92a620dd8036 stable-1.2
Merge of r4769: better diagnostics for directives in wrong context.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 06 Aug 2012 17:31:32 +0000 |
parents | 67653855682e |
children | 6e46016ea276 |
comparison
equal
deleted
inserted
replaced
4802:6fc86fe0b586 | 4803:92a620dd8036 |
---|---|
43 #define NGX_CONF_BLOCK 0x00000100 | 43 #define NGX_CONF_BLOCK 0x00000100 |
44 #define NGX_CONF_FLAG 0x00000200 | 44 #define NGX_CONF_FLAG 0x00000200 |
45 #define NGX_CONF_ANY 0x00000400 | 45 #define NGX_CONF_ANY 0x00000400 |
46 #define NGX_CONF_1MORE 0x00000800 | 46 #define NGX_CONF_1MORE 0x00000800 |
47 #define NGX_CONF_2MORE 0x00001000 | 47 #define NGX_CONF_2MORE 0x00001000 |
48 #define NGX_CONF_MULTI 0x00002000 | 48 #define NGX_CONF_MULTI 0x00000000 /* compatibility */ |
49 | 49 |
50 #define NGX_DIRECT_CONF 0x00010000 | 50 #define NGX_DIRECT_CONF 0x00010000 |
51 | 51 |
52 #define NGX_MAIN_CONF 0x01000000 | 52 #define NGX_MAIN_CONF 0x01000000 |
53 #define NGX_ANY_CONF 0x0F000000 | 53 #define NGX_ANY_CONF 0x0F000000 |