IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

PERL_SYS_TERM() should be called once on exit only, this fixes the message

Browse Source 
panic: MUTEX_LOCK (22) [op.c:352].
BEGIN failed--compilation aborted.
... [alert] ... perl_parse() failed: 9
Scalars leaked: 2

on threaded perl during second reconfiguration.

PERL_SYS_INIT() should be called once too.
This commit is contained in:
Igor Sysoev 2007-05-29 18:48:42 +00:00
parent 78c5893412
commit 8f0c87f384
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,8 @@ static char *ngx_http_perl_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
static void ngx_http_perl_cleanup_perl(void *data);
#endif
static void ngx_http_perl_exit(ngx_cycle_t *cycle);
static ngx_command_t ngx_http_perl_commands[] = {
@ -128,7 +130,7 @@ ngx_module_t ngx_http_perl_module = {
NULL, /* init thread */
NULL, /* exit thread */
NULL, /* exit process */
NULL, /* exit master */
ngx_http_perl_exit, /* exit master */
NGX_MODULE_V1_PADDING
};
@ -478,12 +480,13 @@ ngx_http_perl_init_interpreter(ngx_conf_t *cf, ngx_http_perl_main_conf_t *pmcf)
#endif
PERL_SYS_INIT(&ngx_argc, &ngx_argv);
if (nginx_stash == NULL) {
PERL_SYS_INIT(&ngx_argc, &ngx_argv);
}
pmcf->perl = ngx_http_perl_create_interpreter(cf, pmcf);
if (pmcf->perl == NULL) {
PERL_SYS_TERM();
return NGX_CONF_ERROR;
}
@ -788,8 +791,6 @@ ngx_http_perl_cleanup_perl(void *data)
(void) perl_destruct(perl);
perl_free(perl);
PERL_SYS_TERM();
}
#endif
@ -1001,3 +1002,10 @@ ngx_http_perl_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_OK;
}
static void
ngx_http_perl_exit(ngx_cycle_t *cycle)
{
PERL_SYS_TERM();
}