changeset 550: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 04cfef16b736
children 8af5b52635d0
files CHANGES CHANGES.ru src/core/nginx.h src/core/ngx_regex.c src/http/modules/perl/nginx.pm src/http/modules/perl/ngx_http_perl_module.c
diffstat 6 files changed, 33 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES	Mon Nov 16 00:00:00 2009 +0300
+++ b/CHANGES	Tue Nov 17 00:00:00 2009 +0300
@@ -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 
--- a/CHANGES.ru	Mon Nov 16 00:00:00 2009 +0300
+++ b/CHANGES.ru	Tue Nov 17 00:00:00 2009 +0300
@@ -1,4 +1,10 @@
 
+Изменения в nginx 0.8.27                                          17.11.2009
+
+    *) Исправление: регулярные выражения не работали в nginx/Windows; 
+       ошибка появилась в 0.8.25.
+
+
 Изменения в nginx 0.8.26                                          16.11.2009
 
     *) Исправление: ошибки при использовании выделений в директиве rewrite; 
--- a/src/core/nginx.h	Mon Nov 16 00:00:00 2009 +0300
+++ b/src/core/nginx.h	Tue Nov 17 00:00:00 2009 +0300
@@ -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"
--- a/src/core/ngx_regex.c	Mon Nov 16 00:00:00 2009 +0300
+++ b/src/core/ngx_regex.c	Tue Nov 17 00:00:00 2009 +0300
@@ -35,11 +35,9 @@
         return;
     }
 
-#else
+#endif
 
     ngx_pcre_pool = pool;
-
-#endif
 }
 
 
@@ -55,11 +53,9 @@
         return;
     }
 
-#else
+#endif
 
     ngx_pcre_pool = NULL;
-
-#endif
 }
 
 
--- a/src/http/modules/perl/nginx.pm	Mon Nov 16 00:00:00 2009 +0300
+++ b/src/http/modules/perl/nginx.pm	Tue Nov 17 00:00:00 2009 +0300
@@ -47,7 +47,7 @@
     HTTP_INSUFFICIENT_STORAGE
 );
 
-our $VERSION = '0.8.26';
+our $VERSION = '0.8.27';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);
--- a/src/http/modules/perl/ngx_http_perl_module.c	Mon Nov 16 00:00:00 2009 +0300
+++ b/src/http/modules/perl/ngx_http_perl_module.c	Tue Nov 17 00:00:00 2009 +0300
@@ -152,12 +152,13 @@
 #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 @@
 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 @@
 {
 #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();
     }