comparison src/http/ngx_http_config.h @ 2713:b4d8aef4a1ad

fix segfault if no http section is defined in confguraiton, the bug has been introduced in r1259
author Igor Sysoev <igor@sysoev.ru>
date Wed, 15 Apr 2009 20:26:33 +0000
parents 5d2b8078c1c2
children d094e237abf4
comparison
equal deleted inserted replaced
2712:41f993457021 2713:b4d8aef4a1ad
67 ((ngx_http_conf_ctx_t *) cf->ctx)->srv_conf[module.ctx_index] 67 ((ngx_http_conf_ctx_t *) cf->ctx)->srv_conf[module.ctx_index]
68 #define ngx_http_conf_get_module_loc_conf(cf, module) \ 68 #define ngx_http_conf_get_module_loc_conf(cf, module) \
69 ((ngx_http_conf_ctx_t *) cf->ctx)->loc_conf[module.ctx_index] 69 ((ngx_http_conf_ctx_t *) cf->ctx)->loc_conf[module.ctx_index]
70 70
71 #define ngx_http_cycle_get_module_main_conf(cycle, module) \ 71 #define ngx_http_cycle_get_module_main_conf(cycle, module) \
72 ((ngx_http_conf_ctx_t *) \ 72 (cycle->conf_ctx[ngx_http_module.index] ? \
73 cycle->conf_ctx[ngx_http_module.index])->main_conf[module.ctx_index] 73 ((ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index]) \
74 ->main_conf[module.ctx_index]: \
75 NULL)
74 76
75 77
76 #endif /* _NGX_HTTP_CONFIG_H_INCLUDED_ */ 78 #endif /* _NGX_HTTP_CONFIG_H_INCLUDED_ */