From ca878c8ccc38800b770c7fc7c24b1e97de42c640 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 15 Apr 2009 20:26:33 +0000 Subject: fix segfault if no http section is defined in confguraiton, the bug has been introduced in r1259 --- src/http/modules/perl/ngx_http_perl_module.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/http/modules/perl/ngx_http_perl_module.c') diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c index bad2454ee..833e90f9d 100644 --- a/src/http/modules/perl/ngx_http_perl_module.c +++ b/src/http/modules/perl/ngx_http_perl_module.c @@ -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); - { - - dTHXa(pmcf->perl); - PERL_SET_CONTEXT(pmcf->perl); - - /* set worker's $$ */ + if (pmcf) { + dTHXa(pmcf->perl); + PERL_SET_CONTEXT(pmcf->perl); - sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), (I32) ngx_pid); + /* set worker's $$ */ + sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), (I32) ngx_pid); } return NGX_OK; -- cgit v1.2.3