Mercurial > hg > nginx
comparison src/core/ngx_conf_file.h @ 6305:18428f775b2c
Core: enabled "include" inside http upstreams (ticket #635).
The directive already works inside stream upstream blocks.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 23 Nov 2015 12:40:19 +0300 |
parents | 1b7e246e6b38 |
children | 0f203a2af17c |
comparison
equal
deleted
inserted
replaced
6304:520ec1917f1d | 6305:18428f775b2c |
---|---|
48 #define NGX_CONF_MULTI 0x00000000 /* compatibility */ | 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 0x1F000000 |
54 | 54 |
55 | 55 |
56 | 56 |
57 #define NGX_CONF_UNSET -1 | 57 #define NGX_CONF_UNSET -1 |
58 #define NGX_CONF_UNSET_UINT (ngx_uint_t) -1 | 58 #define NGX_CONF_UNSET_UINT (ngx_uint_t) -1 |