Changeset 8310b2 for server/src/http/modules/ngx_http_index_module.c

Timestamp:

02/03/09 19:45:01 (3 years ago)

Author:

George Potapov <nephrite@…>

Branches:

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

Children:

e86d7f, f54237

Parents:

2ac4f5

git-author:

George Potapov <nephrite@…> (02/03/09 19:45:01)

git-committer:

George Potapov <nephrite@…> (02/03/09 19:45:01)

Message:

vendor drop nginx v0.7.33

File:

• server/src/http/modules/ngx_http_index_module.c (modified) (9 diffs)

server/src/http/modules/ngx_http_index_module.c

@@ -97 +97 @@
 {
     u_char                       *p, *name;
-    size_t                        len, nlen, root, allocated;
+    size_t                        len, root, reserve, allocated;
     ngx_int_t                     rc;
     ngx_str_t                     path, uri;
@@ -129 +129 @@
     dir_tested = 0;
     name = NULL;
+    /* suppress MSVC warning */
     path.data = NULL;
 
@@ -140 +141 @@
             }
 
-            len = ilcf->max_index_len;
-            nlen = index[i].name.len;
+            reserve = ilcf->max_index_len;
+            len = index[i].name.len;
 
         } else {
@@ -150 +151 @@
             e.flushed = 1;
 
-            /* 1 byte for terminating '\0' */
-
+            /* 1 is for terminating '\0' as in static names */
             len = 1;
 
@@ -159 +159 @@
             }
 
-            nlen = len;
-
             /* 16 bytes are preallocation */
 
-            len += 16;
-        }
-
-        if (len > (size_t) (path.data + allocated - name)) {
-
-            name = ngx_http_map_uri_to_path(r, &path, &root, len);
+            reserve = len + 16;
+        }
+
+        if (reserve > allocated) {
+
+            name = ngx_http_map_uri_to_path(r, &path, &root, reserve);
             if (name == NULL) {
                 return NGX_ERROR;
             }
 
-            allocated = path.len;
+            allocated = path.data + path.len - name;
         }
 
@@ -194 +192 @@
 
             if (*name == '/') {
-                uri.len = nlen - 1;
+                uri.len = len - 1;
                 uri.data = name;
                 return ngx_http_internal_redirect(r, &uri, &r->args);
@@ -249 +247 @@
         }
 
-        uri.len = r->uri.len + nlen - 1;
+        uri.len = r->uri.len + len - 1;
 
         if (!clcf->alias) {
@@ -261 +259 @@
 
             p = ngx_copy(uri.data, r->uri.data, r->uri.len);
-            ngx_memcpy(p, name, nlen - 1);
+            ngx_memcpy(p, name, len - 1);
         }
 
@@ -492 +490 @@
             }
 
-            /* include the terminating '\0' to the length to use ngx_copy() */
+            /* include the terminating '\0' to the length to use ngx_memcpy() */
             index->name.len++;