Mercurial > hg > nginx-quic
annotate src/core/ngx_hash.c @ 509:9b8c906f6e63 release-0.1.29
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 12 May 2005 14:58:06 +0000 |
parents | cd3117ad9aab |
children | 4e296b7d25bf |
rev | line source |
---|---|
507 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #include <ngx_config.h> | |
8 #include <ngx_core.h> | |
9 | |
10 | |
11 ngx_int_t | |
509 | 12 ngx_hash_init(ngx_hash_t *hash, ngx_pool_t *pool, void *names, ngx_uint_t nelts) |
507 | 13 { |
14 u_char *p; | |
509 | 15 ngx_str_t *name, *bucket; |
16 ngx_uint_t i, n, key, size, best, *test, buckets, min_buckets; | |
17 | |
18 if (nelts == 0) { | |
19 for (name = (ngx_str_t *) names; | |
20 name->len; | |
21 name = (ngx_str_t *) ((char *) name + hash->bucket_size)) | |
22 { | |
23 nelts++; | |
24 } | |
25 } | |
507 | 26 |
27 test = ngx_alloc(hash->max_size * sizeof(ngx_uint_t), pool->log); | |
28 if (test == NULL) { | |
29 return NGX_ERROR; | |
30 } | |
31 | |
32 min_buckets = hash->bucket_limit + 1; | |
33 | |
34 #if (NGX_SUPPRESS_WARN) | |
35 best = 0; | |
36 #endif | |
37 | |
38 for (size = 1; size < hash->max_size; size++) { | |
39 | |
40 buckets = 0; | |
41 | |
42 for (i = 0; i < size; i++) { | |
43 test[i] = 0; | |
44 } | |
45 | |
509 | 46 for (n = 0, name = (ngx_str_t *) names; |
47 n < nelts; | |
48 n++, name = (ngx_str_t *) ((char *) name + hash->bucket_size)) | |
507 | 49 { |
50 key = 0; | |
51 | |
509 | 52 for (i = 0; i < name->len; i++) { |
53 key += ngx_tolower(name->data[i]); | |
507 | 54 } |
55 | |
56 key %= size; | |
57 | |
58 if (test[key] == hash->bucket_limit) { | |
59 break; | |
60 } | |
61 | |
62 test[key]++; | |
63 | |
64 if (buckets < test[key]) { | |
65 buckets = test[key]; | |
66 } | |
67 } | |
68 | |
509 | 69 if (n == nelts) { |
507 | 70 if (min_buckets > buckets) { |
71 min_buckets = buckets; | |
72 best = size; | |
73 } | |
74 | |
75 if (hash->bucket_limit == 1) { | |
76 break; | |
77 } | |
78 } | |
79 } | |
80 | |
81 if (min_buckets == hash->bucket_limit + 1) { | |
82 ngx_log_error(NGX_LOG_EMERG, pool->log, 0, | |
83 "could not build the %s hash, you should increase " | |
84 "either %s_size: %i or %s_bucket_limit: %i", | |
85 hash->name, hash->name, hash->max_size, | |
86 hash->name, hash->bucket_limit); | |
87 ngx_free(test); | |
88 return NGX_ERROR; | |
89 } | |
90 | |
91 hash->buckets = ngx_pcalloc(pool, best * hash->bucket_size); | |
92 if (hash->buckets == NULL) { | |
93 ngx_free(test); | |
94 return NGX_ERROR; | |
95 } | |
96 | |
97 if (hash->bucket_limit != 1) { | |
98 | |
99 for (i = 0; i < best; i++) { | |
100 test[i] = 0; | |
101 } | |
102 | |
509 | 103 for (n = 0, name = (ngx_str_t *) names; |
104 n < nelts; | |
105 n++, name = (ngx_str_t *) ((char *) name + hash->bucket_size)) | |
507 | 106 { |
107 key = 0; | |
108 | |
509 | 109 for (i = 0; i < name->len; i++) { |
110 key += ngx_tolower(name->data[i]); | |
507 | 111 } |
112 | |
113 key %= best; | |
114 | |
115 test[key]++; | |
116 } | |
117 | |
118 for (i = 0; i < best; i++) { | |
119 if (test[i] == 0) { | |
120 continue; | |
121 } | |
122 | |
123 bucket = ngx_palloc(pool, test[i] * hash->bucket_size); | |
124 if (bucket == NULL) { | |
125 ngx_free(test); | |
126 return NGX_ERROR; | |
127 } | |
128 | |
129 hash->buckets[i] = bucket; | |
130 bucket->len = 0; | |
131 } | |
132 } | |
133 | |
509 | 134 for (n = 0, name = (ngx_str_t *) names; |
135 n < nelts; | |
136 n++, name = (ngx_str_t *) ((char *) name + hash->bucket_size)) | |
507 | 137 { |
138 key = 0; | |
139 | |
509 | 140 for (i = 0; i < name->len; i++) { |
141 key += ngx_tolower(name->data[i]); | |
507 | 142 } |
143 | |
144 key %= best; | |
145 | |
146 if (hash->bucket_limit == 1) { | |
147 p = (u_char *) hash->buckets + key * hash->bucket_size; | |
509 | 148 ngx_memcpy(p, name, hash->bucket_size); |
507 | 149 continue; |
150 } | |
151 | |
152 for (bucket = hash->buckets[key]; | |
153 bucket->len; | |
154 bucket = (ngx_str_t *) ((char *) bucket + hash->bucket_size)) | |
155 { | |
156 bucket->len &= 0x7fffffff; | |
157 } | |
158 | |
509 | 159 ngx_memcpy(bucket, name, hash->bucket_size); |
507 | 160 bucket->len |= 0x80000000; |
161 } | |
162 | |
163 ngx_free(test); | |
164 | |
165 hash->hash_size = best; | |
166 hash->min_buckets = min_buckets; | |
167 | |
168 return NGX_OK; | |
169 } |