Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-04-16 00:26:33 +0400
committerIgor Sysoev <igor@sysoev.ru>2009-04-16 00:26:33 +0400
commitca878c8ccc38800b770c7fc7c24b1e97de42c640 (patch)
treeb6c5e2cdaa2bebbdcd090eaaa0a4765bd2d3e8dd /src/http/modules/perl
parent60798fbea5cf1287aec41c886a1b53dd67304641 (diff)
fix segfault if no http section is defined in confguraiton,
the bug has been introduced in r1259
Diffstat (limited to 'src/http/modules/perl')
-rw-r--r--src/http/modules/perl/ngx_http_perl_module.c12
1 files changed, 5 insertions, 7 deletions
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;