Changeset 2ac4f5

Timestamp:

02/03/09 19:43:30 (3 years ago)

Author:

George Potapov <nephrite@…>

Branches:

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

Children:

8310b2

Parents:

e7b311

git-author:

George Potapov <nephrite@…> (02/03/09 19:43:30)

git-committer:

George Potapov <nephrite@…> (02/03/09 19:43:30)

Message:

vendor drop nginx 0.7.32

Location:

server

Files:

• CHANGES (modified) (1 diff)
• CHANGES.ru (modified) (1 diff)
• src/core/nginx.h (modified) (1 diff)
• src/core/ngx_cycle.c (modified) (1 diff)
• src/core/ngx_open_file_cache.c (modified) (1 diff)
• src/core/ngx_slab.c (modified) (2 diffs)
• src/http/modules/ngx_http_fastcgi_module.c (modified) (7 diffs)
• src/http/modules/ngx_http_geo_module.c (modified) (1 diff)
• src/http/modules/ngx_http_gzip_filter_module.c (modified) (1 diff)
• src/http/modules/perl/nginx.pm (modified) (1 diff)
• src/http/ngx_http_core_module.c (modified) (4 diffs)
• src/http/ngx_http_core_module.h (modified) (1 diff)
• src/http/ngx_http_upstream.c (modified) (1 diff)

server/CHANGES

@@ +1 @@
+
+Changes with nginx 0.7.32                                        26 Jan 2009
+
+    *) Feature: now a directory existence testing can be set explicitly in 
+       the "try_files" directive.
+
+    *) Bugfix: fastcgi_store stored files not always.
+
+    *) Bugfix: in geo ranges.
+
+    *) Bugfix: in shared memory allocations if nginx was built without 
+       debugging.
+       Thanks to Andrey Kvasov.
+
 
 Changes with nginx 0.7.31                                        19 Jan 2009

server/CHANGES.ru

@@ +1 @@
+
+éÚÍÅÎÅÎÉÑ × nginx 0.7.32                                          26.01.2009
+
+    *) äÏÂÁ×ÌÅÎÉÅ: ÔÅÐÅÒØ × ÄÉÒÅËÔÉ×Å try_files ÍÏÖÎÏ Ñ×ÎÏ ÕËÁÚÁÔØ ÐÒÏ×ÅÒËÕ 
+       ËÁÔÁÌÏÇÁ.
+
+    *) éÓÐÒÁ×ÌÅÎÉÅ: fastcgi_store ÎÅ ×ÓÅÇÄÁ ÓÏÈÒÁÎÑÌ ÆÁÊÌÙ.
+
+    *) éÓÐÒÁ×ÌÅÎÉÅ: × ÇÅÏ-ÄÉÁÐÁÚÏÎÁÈ.
+
+    *) éÓÐÒÁ×ÌÅÎÉÅ: ÏÛÉÂËÉ ×ÙÄÅÌÅÎÉÑ ÂÏÌØÛÉÈ ÂÌÏËÏ× × ÒÁÚÄÅÌÑÅÍÏÊ ÐÁÍÑÔÉ, 
+       ÅÓÌÉ nginx ÂÙÌ ÓÏÂÒÁÎ ÂÅÚ ÏÔÌÁÄËÉ.
+       óÐÁÓÉÂÏ áÎÄÒÅÀ ë×ÁÓÏ×Õ.
+
 
 éÚÍÅÎÅÎÉÑ × nginx 0.7.31                                          19.01.2009

server/src/core/nginx.h

@@ -9 +9 @@
 
 
-#define NGINX_VERSION      "0.7.31"
+#define NGINX_VERSION      "0.7.32"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 

server/src/core/ngx_cycle.c

@@ -395 +395 @@
     pool->log = cycle->new_log;
 
+    if (cycle->log->log_level == 0) {
+        cycle->log->log_level = NGX_LOG_ERR;
+    }
+
 
     /* create shared memory */

server/src/core/ngx_open_file_cache.c

@@ -458 +458 @@
         }
 
-        if (of->is_dir) {
+        if (ngx_is_dir(&fi)) {
             goto done;
         }

server/src/core/ngx_slab.c

@@ -662 +662 @@
 
             page->slab = pages | NGX_SLAB_PAGE_START;
-
-#if (NGX_DEBUG)
             page->next = NULL;
             page->prev = NGX_SLAB_PAGE;
-#endif
 
             if (--pages == 0) {
@@ -674 +671 @@
             for (p = page + 1; pages; pages--) {
                 p->slab = NGX_SLAB_PAGE_BUSY;
-#if (NGX_DEBUG)
                 p->next = NULL;
                 p->prev = NGX_SLAB_PAGE;
-#endif
                 p++;
             }

server/src/http/modules/ngx_http_fastcgi_module.c

@@ -136 +136 @@
 static ngx_int_t ngx_http_fastcgi_path_info_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
-static ngx_int_t ngx_http_fastcgi_split(ngx_http_request_t *r,
-    ngx_http_fastcgi_ctx_t *f, ngx_http_fastcgi_loc_conf_t *flcf);
+static ngx_http_fastcgi_ctx_t *ngx_http_fastcgi_split(ngx_http_request_t *r,
+    ngx_http_fastcgi_loc_conf_t *flcf);
 
 static char *ngx_http_fastcgi_pass(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -2112 +2112 @@
     ngx_http_fastcgi_loc_conf_t  *flcf;
 
-    f = ngx_http_get_module_ctx(r, ngx_http_fastcgi_module);
     flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module);
 
-    if (ngx_http_fastcgi_split(r, f, flcf) != NGX_OK) {
+    f = ngx_http_fastcgi_split(r, flcf);
+
+    if (f == NULL) {
         return NGX_ERROR;
     }
@@ -2152 +2153 @@
     ngx_http_fastcgi_loc_conf_t  *flcf;
 
-    f = ngx_http_get_module_ctx(r, ngx_http_fastcgi_module);
     flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module);
 
-    if (ngx_http_fastcgi_split(r, f, flcf) != NGX_OK) {
+    f = ngx_http_fastcgi_split(r, flcf);
+
+    if (f == NULL) {
         return NGX_ERROR;
     }
@@ -2169 +2171 @@
 
 
-static ngx_int_t
-ngx_http_fastcgi_split(ngx_http_request_t *r, ngx_http_fastcgi_ctx_t *f,
-    ngx_http_fastcgi_loc_conf_t *flcf)
+static ngx_http_fastcgi_ctx_t *
+ngx_http_fastcgi_split(ngx_http_request_t *r, ngx_http_fastcgi_loc_conf_t *flcf)
 {
+    ngx_http_fastcgi_ctx_t       *f;
 #if (NGX_PCRE)
-    ngx_int_t  n;
-    int        captures[(1 + 2) * 3];
+    ngx_int_t                     n;
+    int                           captures[(1 + 2) * 3];
+
+    f = ngx_http_get_module_ctx(r, ngx_http_fastcgi_module);
+
+    if (f == NULL) {
+        f = ngx_pcalloc(r->pool, sizeof(ngx_http_fastcgi_ctx_t));
+        if (f == NULL) {
+            return NULL;
+        }
+
+        ngx_http_set_ctx(r, f, ngx_http_fastcgi_module);
+    }
 
     if (f->script_name.len) {
-        return NGX_OK;
+        return f;
     }
 
     if (flcf->split_regex == NULL) {
         f->script_name = r->uri;
-        return NGX_OK;
+        return f;
     }
 
@@ -2190 +2203 @@
     if (n == NGX_REGEX_NO_MATCHED) {
         f->script_name = r->uri;
-        return NGX_OK;
+        return f;
     }
 
@@ -2197 +2210 @@
                       ngx_regex_exec_n " failed: %d on \"%V\" using \"%V\"",
                       n, &r->uri, &flcf->split_name);
-        return NGX_ERROR;
+        return NULL;
     }
 
@@ -2208 +2221 @@
     f->path_info.data = r->uri.data + f->script_name.len;
 
-    return NGX_OK;
+    return f;
 
 #else
 
+    f = ngx_http_get_module_ctx(r, ngx_http_fastcgi_module);
+
+    if (f == NULL) {
+        f = ngx_pcalloc(r->pool, sizeof(ngx_http_fastcgi_ctx_t));
+        if (f == NULL) {
+            return NULL;
+        }
+
+        ngx_http_set_ctx(r, f, ngx_http_fastcgi_module);
+    }
+
     f->script_name = r->uri;
 
-    return NGX_OK;
+    return f;
 
 #endif

server/src/http/modules/ngx_http_geo_module.c

@@ -637 +637 @@
                 range = a->elts;
 
-                ngx_memcpy(&range[i + 2], &range[i + 1],
-                           (a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
+                ngx_memcpy(&range[i + 1], &range[i],
+                           (a->nelts - 1 - i) * sizeof(ngx_http_geo_range_t));
 
                 range[i + 1].start = (u_short) (e + 1);

server/src/http/modules/ngx_http_gzip_filter_module.c

@@ -303 +303 @@
 
         if (in) {
-        switch (ngx_http_gzip_filter_copy_recycled(ctx, in)) {
-
-        case NGX_OK:
-        return NGX_OK;
-
-        case NGX_DONE:
-        in = NULL;
-        break;
-
-        default:  /* NGX_ERROR */
-        goto failed;
-        }
+            switch (ngx_http_gzip_filter_copy_recycled(ctx, in)) {
+
+            case NGX_OK:
+                return NGX_OK;
+
+            case NGX_DONE:
+                in = NULL;
+                break;
+
+            default:  /* NGX_ERROR */
+                goto failed;
+            }
 
         } else {

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

@@ -48 +48 @@
 );
 
-our $VERSION = '0.7.31';
+our $VERSION = '0.7.32';
 
 require XSLoader;

server/src/http/ngx_http_core_module.c

@@ -1039 +1039 @@
     u_char                       *p, *name;
     ngx_str_t                     path;
+    ngx_uint_t                    test_dir;
     ngx_http_try_file_t          *tf;
     ngx_open_file_info_t          of;
@@ -1133 +1134 @@
             }
         }
+
+        test_dir = tf->test_dir;
 
         tf++;
@@ -1173 +1176 @@
         }
 
-        if (!of.is_file) {
+        if (of.is_dir && !test_dir) {
             continue;
         }
@@ -3854 +3857 @@
         tf[i].name = value[i + 1];
 
+        if (tf[i].name.data[tf[i].name.len - 1] == '/') {
+            tf[i].test_dir = 1;
+            tf[i].name.len--;
+        }
+
         n = ngx_http_script_variables_count(&tf[i].name);
 

server/src/http/ngx_http_core_module.h

@@ -246 +246 @@
     ngx_array_t               *values;
     ngx_str_t                  name;
+    ngx_uint_t                 test_dir;   /* unsigned  test_dir:1; */
 } ngx_http_try_file_t;
 

server/src/http/ngx_http_upstream.c

@@ -2218 +2218 @@
             tf = u->pipe->temp_file;
 
-            if (p->upstream_eof) {
+            if (p->upstream_eof || p->upstream_done) {
 
                 if (u->headers_in.status_n == NGX_HTTP_OK