diff src/core/ngx_hash.c @ 198:e6da4931e0e0 NGINX_0_3_46

nginx 0.3.46 *) Feature: the "proxy_hide_header", "proxy_pass_header", "fastcgi_hide_header", and "fastcgi_pass_header" directives. *) Change: the "proxy_pass_x_powered_by", "fastcgi_x_powered_by", and "proxy_pass_server" directives were canceled. *) Feature: the "X-Accel-Buffering" response header line is supported in proxy mode. *) Bugfix: the reconfiguration bug and memory leaks in the ngx_http_perl_module.
author Igor Sysoev <http://sysoev.ru>
date Thu, 11 May 2006 00:00:00 +0400
parents 4cd3e70c4d60
children ff906029dd40
line wrap: on
line diff
--- a/src/core/ngx_hash.c
+++ b/src/core/ngx_hash.c
@@ -525,180 +525,6 @@ ngx_hash_key_lc(u_char *data, size_t len
 
 
 ngx_int_t
-ngx_hash0_init(ngx_hash0_t *hash, ngx_pool_t *pool, void *names,
-    ngx_uint_t nelts)
-{
-    u_char      *p;
-    ngx_str_t   *name, *bucket;
-    ngx_uint_t   i, n, key, size, best, *test, buckets, min_buckets;
-
-    if (nelts == 0) {
-        for (name = (ngx_str_t *) names;
-             name->len;
-             name = (ngx_str_t *) ((char *) name + hash->bucket_size))
-        {
-            nelts++;
-        }
-    }
-
-    test = ngx_alloc(hash->max_size * sizeof(ngx_uint_t), pool->log);
-    if (test == NULL) {
-        return NGX_ERROR;
-    }
-
-    min_buckets = hash->bucket_limit + 1;
-
-#if (NGX_SUPPRESS_WARN)
-    best = 0;
-#endif
-
-    for (size = 1; size < hash->max_size; size++) {
-
-        buckets = 0;
-
-        for (i = 0; i < size; i++) {
-            test[i] = 0;
-        }
-
-        for (n = 0, name = (ngx_str_t *) names;
-             n < nelts;
-             n++, name = (ngx_str_t *) ((char *) name + hash->bucket_size))
-        {
-            if (name->data == NULL) {
-                continue;
-            }
-
-            key = 0;
-
-            for (i = 0; i < name->len; i++) {
-                key += ngx_tolower(name->data[i]);
-            }
-
-            key %= size;
-
-            if (test[key] == hash->bucket_limit) {
-                break;
-            }
-
-            test[key]++;
-
-            if (buckets < test[key]) {
-                buckets = test[key];
-            }
-        }
-
-        if (n == nelts) {
-            if (min_buckets > buckets) {
-                min_buckets = buckets;
-                best = size;
-            }
-
-            if (hash->bucket_limit == 1) {
-                break;
-            }
-        }
-    }
-
-    if (min_buckets == hash->bucket_limit + 1) {
-        ngx_log_error(NGX_LOG_EMERG, pool->log, 0,
-                      "could not build the %s hash, you should increase "
-                      "either %s_size: %i or %s_bucket_limit: %i",
-                      hash->name, hash->name, hash->max_size,
-                      hash->name, hash->bucket_limit);
-        ngx_free(test);
-        return NGX_ERROR;
-    }
-
-    hash->buckets = ngx_pcalloc(pool, best * hash->bucket_size);
-    if (hash->buckets == NULL) {
-        ngx_free(test);
-        return NGX_ERROR;
-    }
-
-    if (hash->bucket_limit != 1) {
-
-        for (i = 0; i < best; i++) {
-            test[i] = 0;
-        }
-
-        for (n = 0, name = (ngx_str_t *) names;
-             n < nelts;
-             n++, name = (ngx_str_t *) ((char *) name + hash->bucket_size))
-        {
-            if (name->data == NULL) {
-                continue;
-            }
-
-            key = 0;
-
-            for (i = 0; i < name->len; i++) {
-                key += ngx_tolower(name->data[i]);
-            }
-
-            key %= best;
-
-            test[key]++;
-        }
-
-        for (i = 0; i < best; i++) {
-            if (test[i] == 0) {
-                continue;
-            }
-
-            bucket = ngx_palloc(pool, test[i] * hash->bucket_size);
-            if (bucket == NULL) {
-                ngx_free(test);
-                return NGX_ERROR;
-            }
-
-            hash->buckets[i] = bucket;
-            bucket->len = 0;
-        }
-    }
-
-    for (n = 0, name = (ngx_str_t *) names;
-         n < nelts;
-         n++, name = (ngx_str_t *) ((char *) name + hash->bucket_size))
-    {
-        if (name->data == NULL) {
-            continue;
-        }
-
-        key = 0;
-
-        for (i = 0; i < name->len; i++) {
-            key += ngx_tolower(name->data[i]);
-        }
-
-        key %= best;
-
-        if (hash->bucket_limit == 1) {
-            p = (u_char *) hash->buckets + key * hash->bucket_size;
-            ngx_memcpy(p, name, hash->bucket_size);
-            continue;
-        }
-
-        for (bucket = hash->buckets[key];
-             bucket->len;
-             bucket = (ngx_str_t *) ((char *) bucket + hash->bucket_size))
-        {
-            bucket->len &= 0x7fffffff;
-        }
-
-        ngx_memcpy(bucket, name, hash->bucket_size);
-        bucket->len |= 0x80000000;
-    }
-
-    ngx_free(test);
-
-    hash->hash_size = best;
-    hash->min_buckets = min_buckets;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
 ngx_hash_keys_array_init(ngx_hash_keys_arrays_t *ha, ngx_uint_t type)
 {
     ngx_uint_t  asize;