Mercurial > hg > nginx-mail
diff src/http/modules/perl/ngx_http_perl_module.c @ 593:697030d79811 NGINX_0_8_27
nginx 0.8.27
*) Bugfix: regular expressions did work in nginx/Windows; the bug had
appeared in 0.8.25.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 17 Nov 2009 00:00:00 +0300 |
parents | f7ec98e3caeb |
children | da3c99095432 |
line wrap: on
line diff
--- a/src/http/modules/perl/ngx_http_perl_module.c +++ b/src/http/modules/perl/ngx_http_perl_module.c @@ -152,12 +152,13 @@ static ngx_http_ssi_command_t ngx_http_ #endif -static ngx_str_t ngx_null_name = ngx_null_string; - -static HV *nginx_stash; +static ngx_str_t ngx_null_name = ngx_null_string; +static HV *nginx_stash; #if (NGX_HAVE_PERL_MULTIPLICITY) -static ngx_uint_t ngx_perl_term; +static ngx_uint_t ngx_perl_term; +#else +static PerlInterpreter *perl; #endif @@ -461,18 +462,16 @@ ngx_http_perl_ssi(ngx_http_request_t *r, static char * ngx_http_perl_init_interpreter(ngx_conf_t *cf, ngx_http_perl_main_conf_t *pmcf) { - ngx_str_t *m; - ngx_uint_t i; + ngx_str_t *m; + ngx_uint_t i; #if (NGX_HAVE_PERL_MULTIPLICITY) - ngx_pool_cleanup_t *cln; + ngx_pool_cleanup_t *cln; cln = ngx_pool_cleanup_add(cf->pool, 0); if (cln == NULL) { return NGX_CONF_ERROR; } -#else - static PerlInterpreter *perl; #endif #ifdef NGX_PERL_MODULES @@ -1064,19 +1063,21 @@ ngx_http_perl_exit(ngx_cycle_t *cycle) { #if (NGX_HAVE_PERL_MULTIPLICITY) + /* + * the master exit hook is run before global pool cleanup, + * therefore just set flag here + */ + ngx_perl_term = 1; #else - ngx_http_perl_main_conf_t *pmcf; - pmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_perl_module); - - if (pmcf && nginx_stash) { + if (nginx_stash) { ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cycle->log, 0, "perl term"); - (void) perl_destruct(pmcf->perl); + (void) perl_destruct(perl); - perl_free(pmcf->perl); + perl_free(perl); PERL_SYS_TERM(); }