From d1dd84060ba0825ca9e224a22b34bcc0a9ce0752 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Sun, 17 Jun 2007 19:10:13 +0000
Subject: Changes with nginx 0.5.26                                        17
 Jun 2007

    *) Bugfix: in SSI parsing.
---
 CHANGES                                       | 5 +++++
 CHANGES.ru                                    | 5 +++++
 src/core/nginx.h                              | 2 +-
 src/http/modules/ngx_http_ssi_filter_module.c | 1 +
 src/http/modules/perl/nginx.pm                | 2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6af7b3ace..7f9476093 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+Changes with nginx 0.5.26                                        17 Jun 2007
+
+    *) Bugfix: in SSI parsing.
+
+
 Changes with nginx 0.5.25                                        11 Jun 2007
 
     *) Bugfix: nginx could not be built with the 
diff --git a/CHANGES.ru b/CHANGES.ru
index 0c7d47924..c3c90c853 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,9 @@
 
+Изменения в nginx 0.5.26                                          17.06.2007
+
+    *) Исправление: в парсинге SSI.
+
+
 Изменения в nginx 0.5.25                                          11.06.2007
 
     *) Исправление: nginx не собирался с параметром 
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 4b4653fed..991c7be55 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VERSION      "0.5.25"
+#define NGINX_VERSION      "0.5.26"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define NGINX_VAR          "NGINX"
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index f16c34736..5343ca0be 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -1020,6 +1020,7 @@ ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx)
                 ch = *p;
             }
 
+            ctx->state = state;
             ctx->pos = p;
             ctx->looked = looked;
             ctx->copy_end = p;
diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm
index 9a6b0c71e..550cf1f3e 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.5.25';
+our $VERSION = '0.5.26';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);
-- 
cgit v1.2.1