Changeset 581455

Timestamp:

07/19/08 10:32:05 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master-v0.7, nginx-v0.7, nginx-v0.8, upstream_count_limit

Children:

46d3eb

Parents:

aeeac8

git-author:

Tomash Brechko <tomash.brechko@…> (07/19/08 10:32:05)

git-committer:

Tomash Brechko <tomash.brechko@…> (07/19/08 10:32:05)

Message:

Commit of nginx 0.7.5

Location:

server

Files:

• CHANGES (modified) (1 diff)
• CHANGES.ru (modified) (1 diff)
• src/core/nginx.h (modified) (1 diff)
• src/http/modules/ngx_http_log_module.c (modified) (3 diffs)
• src/http/modules/ngx_http_ssi_filter_module.c (modified) (1 diff)
• src/http/modules/ngx_http_sub_filter_module.c (modified) (1 diff)
• src/http/modules/perl/nginx.pm (modified) (1 diff)
• src/http/ngx_http_header_filter_module.c (modified) (2 diffs)
• src/http/ngx_http_request.c (modified) (2 diffs)

server/CHANGES

@@ +1 @@
+
+Changes with nginx 0.7.5                                         01 Jul 2008
+
+    *) Bugfixes in variables support in the "access_log" directive; the bug 
+       had appeared in 0.7.4.
+
+    *) Bugfix: nginx could not be built --without-http_gzip_module; the bug 
+       had appeared in 0.7.3.
+       Thanks to Kirill A. Korinskiy.
+
+    *) Bugfix: if sub_filter and SSI were used together, then responses 
+       might were transferred incorrectly.
+
 
 Changes with nginx 0.7.4                                         30 Jun 2008

server/CHANGES.ru

@@ +1 @@
+
+éÚÍÅÎÅÎÉÑ × nginx 0.7.5                                           01.07.2008
+
+    *) éÓÐÒÁ×ÌÅÎÉÑ × ÐÏÄÄÅÒÖËÅ ÐÅÒÅÍÅÎÎÙÈ × ÄÉÒÅËÔÉ×Å access_log; ÏÛÉÂËÁ 
+       ÐÏÑ×ÉÌÁÓØ × 0.7.4.
+
+    *) éÓÐÒÁ×ÌÅÎÉÅ: nginx ÎÅ ÓÏÂÉÒÁÌÓÑ Ó ÐÁÒÁÍÅÔÒÏÍ 
+       --without-http_gzip_module; ÏÛÉÂËÁ ÐÏÑ×ÉÌÁÓØ × 0.7.3.
+       óÐÁÓÉÂÏ ëÉÒÉÌÌÕ ëÏÒÉÎÓËÏÍÕ.
+
+    *) éÓÐÒÁ×ÌÅÎÉÅ: ÐÒÉ ÓÏ×ÍÅÓÔÎÏÍ ÉÓÐÏÌØÚÏ×ÁÎÉÉ sub_filter É SSI ÏÔ×ÅÔÙ 
+       ÍÏÇÌÉ ÐÅÒÅÄÁ×ÁÔØÓÑ ÎÅ×ÅÒÎÏ.
+
 
 éÚÍÅÎÅÎÉÑ × nginx 0.7.4                                           30.06.2008

server/src/core/nginx.h

@@ -9 +9 @@
 
 
-#define NGINX_VERSION      "0.7.4"
+#define NGINX_VERSION      "0.7.5"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 

server/src/http/modules/ngx_http_log_module.c

@@ -423 +423 @@
         ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
                       ngx_open_file_n " \"%s\" failed", log.data);
-        return -1;
+        /* simulate successfull logging */
+        return len;
     }
 
@@ -761 +762 @@
     }
 
-    *conf = *prev;
+    conf->logs = prev->logs;
+    conf->off = prev->off;
 
     if (conf->logs || conf->off) {
@@ -782 +784 @@
     }
 
+    log->script = NULL;
     log->disk_full_time = 0;
     log->error_log_time = 0;

server/src/http/modules/ngx_http_ssi_filter_module.c

@@ -559 +559 @@
                         if (slcf->min_file_chunk < (size_t) (b->last - b->pos))
                         {
-                            b->file_last = b->file_pos + (b->last - b->start);
-                            b->file_pos += b->pos - b->start;
+                            b->file_last = b->file_pos
+                                                   + (b->last - ctx->buf->pos);
+                            b->file_pos += b->pos - ctx->buf->pos;
 
                         } else {

server/src/http/modules/ngx_http_sub_filter_module.c

@@ -323 +323 @@
 
                 if (b->in_file) {
-                    b->file_last = b->file_pos + (b->last - b->start);
-                    b->file_pos += b->pos - b->start;
+                    b->file_last = b->file_pos + (b->last - ctx->buf->pos);
+                    b->file_pos += b->pos - ctx->buf->pos;
                 }
 

server/src/http/modules/perl/nginx.pm

@@ -48 +48 @@
 );
 
-our $VERSION = '0.7.4';
+our $VERSION = '0.7.5';
 
 require XSLoader;

server/src/http/ngx_http_header_filter_module.c

@@ -348 +348 @@
     }
 
+#if (NGX_HTTP_GZIP)
     if (r->gzip && clcf->gzip_vary) {
         len += sizeof("Vary: Accept-Encoding" CRLF) - 1;
     }
+#endif
 
     part = &r->headers_out.headers.part;
@@ -521 +523 @@
     }
 
+#if (NGX_HTTP_GZIP)
     if (r->gzip && clcf->gzip_vary) {
         b->last = ngx_cpymem(b->last, "Vary: Accept-Encoding" CRLF,
                              sizeof("Vary: Accept-Encoding" CRLF) - 1);
     }
+#endif
 
     part = &r->headers_out.headers.part;

server/src/http/ngx_http_request.c

@@ -2624 +2624 @@
     }
 
+    log->action = "logging request";
+
     cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
 
@@ -2631 +2633 @@
         log_handler[i](r);
     }
+
+    log->action = "closing request";
 
     if (r->connection->timedout) {