Changes with nginx 0.8.27 17 Nov 2009v0.8.27

    *) Bugfix: regular expressions did work in nginx/Windows; the bug had
       appeared in 0.8.25.

6 files changed, 33 insertions, 24 deletions

diff --git a/CHANGES b/CHANGES
index b78ac0522..b1d40ed62 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+Changes with nginx 0.8.27                                        17 Nov 2009
+
+    *) Bugfix: regular expressions did work in nginx/Windows; the bug had 
+       appeared in 0.8.25.
+
+
 Changes with nginx 0.8.26                                        16 Nov 2009
 
     *) Bugfix: in captures usage in "rewrite" directive; the bug had 
diff --git a/CHANGES.ru b/CHANGES.ru
index b27115655..b326cf9aa 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,10 @@
 
+Изменения в nginx 0.8.27                                          17.11.2009
+
+    *) Исправление: регулярные выражения не работали в nginx/Windows; 
+       ошибка появилась в 0.8.25.
+
+
 Изменения в nginx 0.8.26                                          16.11.2009
 
     *) Исправление: ошибки при использовании выделений в директиве rewrite; 
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 95458eec7..90b4d7da6 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,8 +8,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version         8026
-#define NGINX_VERSION      "0.8.26"
+#define nginx_version         8027
+#define NGINX_VERSION      "0.8.27"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define NGINX_VAR          "NGINX"
diff --git a/src/core/ngx_regex.c b/src/core/ngx_regex.c
index 18e3c26c5..984a28aa9 100644
--- a/src/core/ngx_regex.c
+++ b/src/core/ngx_regex.c
@@ -35,11 +35,9 @@ ngx_regex_malloc_init(ngx_pool_t *pool)
         return;
     }
 
-#else
+#endif
 
     ngx_pcre_pool = pool;
-
-#endif
 }
 
 
@@ -55,11 +53,9 @@ ngx_regex_malloc_done(void)
         return;
     }
 
-#else
+#endif
 
     ngx_pcre_pool = NULL;
-
-#endif
 }
 
 
diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm
index f863ad450..cc20800e3 100644
--- a/src/http/modules/perl/nginx.pm
+++ b/src/http/modules/perl/nginx.pm
@@ -47,7 +47,7 @@ our @EXPORT = qw(
     HTTP_INSUFFICIENT_STORAGE
 );
 
-our $VERSION = '0.8.26';
+our $VERSION = '0.8.27';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);
diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c
index 642197fd8..9cdd17551 100644
--- 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_perl_ssi_command = {
 #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, ngx_http_ssi_ctx_t *ssi_ctx,
 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();
     }