comparison src/http/ngx_http_config.h @ 635:e67b227c8dbb default tip

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents 09d5f308901f
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
54 #define ngx_http_get_module_main_conf(r, module) \ 54 #define ngx_http_get_module_main_conf(r, module) \
55 (r)->main_conf[module.ctx_index] 55 (r)->main_conf[module.ctx_index]
56 #define ngx_http_get_module_srv_conf(r, module) (r)->srv_conf[module.ctx_index] 56 #define ngx_http_get_module_srv_conf(r, module) (r)->srv_conf[module.ctx_index]
57 #define ngx_http_get_module_loc_conf(r, module) (r)->loc_conf[module.ctx_index] 57 #define ngx_http_get_module_loc_conf(r, module) (r)->loc_conf[module.ctx_index]
58 58
59 /*
60 * ngx_http_conf_get_module_srv_conf() and ngx_http_conf_get_module_loc_conf()
61 * must not be used at the merge phase because cf->ctx points to http{}'s ctx
62 */
63 59
64 #define ngx_http_conf_get_module_main_conf(cf, module) \ 60 #define ngx_http_conf_get_module_main_conf(cf, module) \
65 ((ngx_http_conf_ctx_t *) cf->ctx)->main_conf[module.ctx_index] 61 ((ngx_http_conf_ctx_t *) cf->ctx)->main_conf[module.ctx_index]
66 #define ngx_http_conf_get_module_srv_conf(cf, module) \ 62 #define ngx_http_conf_get_module_srv_conf(cf, module) \
67 ((ngx_http_conf_ctx_t *) cf->ctx)->srv_conf[module.ctx_index] 63 ((ngx_http_conf_ctx_t *) cf->ctx)->srv_conf[module.ctx_index]