mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-13 06:12:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix segfault if no http section is defined in confguraiton,

Browse Source 
the bug has been introduced in r1259
This commit is contained in:
Igor Sysoev 2009-04-15 20:26:33 +00:00
parent 60798fbea5
commit ca878c8ccc
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/http/modules/perl/ngx_http_perl_module.c
View File

@ -1041,15 +1041,13 @@ ngx_http_perl_init_worker(ngx_cycle_t *cycle)
pmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_perl_module); pmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_perl_module);
{ if (pmcf) {
dTHXa(pmcf->perl);
PERL_SET_CONTEXT(pmcf->perl);
dTHXa(pmcf->perl); /* set worker's $$ */
PERL_SET_CONTEXT(pmcf->perl);
/* set worker's $$ */
sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), (I32) ngx_pid);
sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), (I32) ngx_pid);
} }
return NGX_OK; return NGX_OK;

6
src/http/ngx_http_config.h
View File

@ -69,8 +69,10 @@ typedef struct {
((ngx_http_conf_ctx_t *) cf->ctx)->loc_conf[module.ctx_index] ((ngx_http_conf_ctx_t *) cf->ctx)->loc_conf[module.ctx_index]
#define ngx_http_cycle_get_module_main_conf(cycle, module) \ #define ngx_http_cycle_get_module_main_conf(cycle, module) \
((ngx_http_conf_ctx_t *) \ (cycle->conf_ctx[ngx_http_module.index] ? \
cycle->conf_ctx[ngx_http_module.index])->main_conf[module.ctx_index] ((ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index]) \
->main_conf[module.ctx_index]: \
NULL)
#endif /* _NGX_HTTP_CONFIG_H_INCLUDED_ */ #endif /* _NGX_HTTP_CONFIG_H_INCLUDED_ */