Mercurial > hg > nginx
annotate src/http/modules/ngx_http_limit_req_module.c @ 3779:57aecfdcac3d
an excess was logged as 0.000 if requests were limited without delay:
*) use a real excess value instead of non-updated limit_req rbtree node field,
*) move inactivity queue handling inside ngx_http_limit_req_lookup()
since the node is not required outside the lookup function;
the bug has been introduced in r3184
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Wed, 13 Oct 2010 20:58:41 +0000 |
| parents | eb156d98a9fa |
| children | d94d7104f598 |
| rev | line source |
|---|---|
| 980 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4 */ | |
| 5 | |
| 6 | |
| 7 #include <ngx_config.h> | |
| 8 #include <ngx_core.h> | |
| 9 #include <ngx_http.h> | |
| 10 | |
| 11 | |
| 12 typedef struct { | |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
13 u_char color; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
14 u_char dummy; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
15 u_short len; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
16 ngx_queue_t queue; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
17 ngx_msec_t last; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
18 /* integer value, 1 corresponds to 0.001 r/s */ |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
19 ngx_uint_t excess; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
20 u_char data[1]; |
| 2294 | 21 } ngx_http_limit_req_node_t; |
| 980 | 22 |
| 23 | |
| 24 typedef struct { | |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
25 ngx_rbtree_t rbtree; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
26 ngx_rbtree_node_t sentinel; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
27 ngx_queue_t queue; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
28 } ngx_http_limit_req_shctx_t; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
29 |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
30 |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
31 typedef struct { |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
32 ngx_http_limit_req_shctx_t *sh; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
33 ngx_slab_pool_t *shpool; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
34 /* integer value, 1 corresponds to 0.001 r/s */ |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
35 ngx_uint_t rate; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
36 ngx_int_t index; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
37 ngx_str_t var; |
| 2294 | 38 } ngx_http_limit_req_ctx_t; |
| 987 | 39 |
| 40 | |
| 41 typedef struct { | |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
42 ngx_shm_zone_t *shm_zone; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
43 /* integer value, 1 corresponds to 0.001 r/s */ |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
44 ngx_uint_t burst; |
| 3185 | 45 ngx_uint_t limit_log_level; |
| 46 ngx_uint_t delay_log_level; | |
| 47 | |
| 48 ngx_uint_t nodelay; /* unsigned nodelay:1 */ | |
| 2294 | 49 } ngx_http_limit_req_conf_t; |
| 980 | 50 |
| 51 | |
| 2294 | 52 static void ngx_http_limit_req_delay(ngx_http_request_t *r); |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
53 static ngx_int_t ngx_http_limit_req_lookup(ngx_http_limit_req_conf_t *lrcf, |
|
3779
57aecfdcac3d
an excess was logged as 0.000 if requests were limited without delay:
Igor Sysoev <igor@sysoev.ru>
parents:
3525
diff
changeset
|
54 ngx_uint_t hash, u_char *data, size_t len, ngx_uint_t *ep); |
| 2294 | 55 static void ngx_http_limit_req_expire(ngx_http_limit_req_ctx_t *ctx, |
| 56 ngx_uint_t n); | |
| 980 | 57 |
| 2294 | 58 static void *ngx_http_limit_req_create_conf(ngx_conf_t *cf); |
| 59 static char *ngx_http_limit_req_merge_conf(ngx_conf_t *cf, void *parent, | |
| 980 | 60 void *child); |
| 2294 | 61 static char *ngx_http_limit_req_zone(ngx_conf_t *cf, ngx_command_t *cmd, |
| 980 | 62 void *conf); |
| 2294 | 63 static char *ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, |
| 980 | 64 void *conf); |
| 2294 | 65 static ngx_int_t ngx_http_limit_req_init(ngx_conf_t *cf); |
| 980 | 66 |
| 67 | |
| 3185 | 68 static ngx_conf_enum_t ngx_http_limit_req_log_levels[] = { |
| 69 { ngx_string("info"), NGX_LOG_INFO }, | |
| 70 { ngx_string("notice"), NGX_LOG_NOTICE }, | |
| 71 { ngx_string("warn"), NGX_LOG_WARN }, | |
| 72 { ngx_string("error"), NGX_LOG_ERR }, | |
| 73 { ngx_null_string, 0 } | |
| 74 }; | |
| 75 | |
| 76 | |
| 2294 | 77 static ngx_command_t ngx_http_limit_req_commands[] = { |
| 980 | 78 |
| 2294 | 79 { ngx_string("limit_req_zone"), |
| 987 | 80 NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE3, |
| 2294 | 81 ngx_http_limit_req_zone, |
| 980 | 82 0, |
| 83 0, | |
| 84 NULL }, | |
| 85 | |
| 2294 | 86 { ngx_string("limit_req"), |
| 87 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123, | |
| 88 ngx_http_limit_req, | |
| 980 | 89 NGX_HTTP_LOC_CONF_OFFSET, |
| 90 0, | |
| 91 NULL }, | |
| 92 | |
| 3185 | 93 { ngx_string("limit_req_log_level"), |
| 94 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 95 ngx_conf_set_enum_slot, | |
| 96 NGX_HTTP_LOC_CONF_OFFSET, | |
| 97 offsetof(ngx_http_limit_req_conf_t, limit_log_level), | |
| 98 &ngx_http_limit_req_log_levels }, | |
| 99 | |
| 980 | 100 ngx_null_command |
| 101 }; | |
| 102 | |
| 103 | |
| 2294 | 104 static ngx_http_module_t ngx_http_limit_req_module_ctx = { |
| 980 | 105 NULL, /* preconfiguration */ |
| 2294 | 106 ngx_http_limit_req_init, /* postconfiguration */ |
| 980 | 107 |
| 108 NULL, /* create main configuration */ | |
| 109 NULL, /* init main configuration */ | |
| 110 | |
| 111 NULL, /* create server configuration */ | |
| 112 NULL, /* merge server configuration */ | |
| 113 | |
| 2294 | 114 ngx_http_limit_req_create_conf, /* create location configration */ |
| 115 ngx_http_limit_req_merge_conf /* merge location configration */ | |
| 980 | 116 }; |
| 117 | |
| 118 | |
| 2294 | 119 ngx_module_t ngx_http_limit_req_module = { |
| 980 | 120 NGX_MODULE_V1, |
| 2294 | 121 &ngx_http_limit_req_module_ctx, /* module context */ |
| 122 ngx_http_limit_req_commands, /* module directives */ | |
| 980 | 123 NGX_HTTP_MODULE, /* module type */ |
| 124 NULL, /* init master */ | |
| 125 NULL, /* init module */ | |
| 126 NULL, /* init process */ | |
| 127 NULL, /* init thread */ | |
| 128 NULL, /* exit thread */ | |
| 129 NULL, /* exit process */ | |
| 130 NULL, /* exit master */ | |
| 131 NGX_MODULE_V1_PADDING | |
| 132 }; | |
| 133 | |
| 134 | |
| 135 static ngx_int_t | |
| 2294 | 136 ngx_http_limit_req_handler(ngx_http_request_t *r) |
| 980 | 137 { |
| 2294 | 138 size_t len, n; |
| 139 uint32_t hash; | |
| 140 ngx_int_t rc; | |
| 2313 | 141 ngx_uint_t excess; |
| 2294 | 142 ngx_time_t *tp; |
| 143 ngx_rbtree_node_t *node; | |
| 144 ngx_http_variable_value_t *vv; | |
| 145 ngx_http_limit_req_ctx_t *ctx; | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
146 ngx_http_limit_req_node_t *lr; |
|
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
147 ngx_http_limit_req_conf_t *lrcf; |
| 980 | 148 |
| 2294 | 149 if (r->main->limit_req_set) { |
|
984
dd128232e6ba
count connection once per request
Igor Sysoev <igor@sysoev.ru>
parents:
981
diff
changeset
|
150 return NGX_DECLINED; |
|
dd128232e6ba
count connection once per request
Igor Sysoev <igor@sysoev.ru>
parents:
981
diff
changeset
|
151 } |
|
dd128232e6ba
count connection once per request
Igor Sysoev <igor@sysoev.ru>
parents:
981
diff
changeset
|
152 |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
153 lrcf = ngx_http_get_module_loc_conf(r, ngx_http_limit_req_module); |
| 980 | 154 |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
155 if (lrcf->shm_zone == NULL) { |
| 980 | 156 return NGX_DECLINED; |
| 157 } | |
| 158 | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
159 ctx = lrcf->shm_zone->data; |
| 987 | 160 |
| 161 vv = ngx_http_get_indexed_variable(r, ctx->index); | |
| 980 | 162 |
| 163 if (vv == NULL || vv->not_found) { | |
| 164 return NGX_DECLINED; | |
| 165 } | |
| 166 | |
|
1011
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
167 len = vv->len; |
|
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
168 |
|
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
169 if (len == 0) { |
|
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
170 return NGX_DECLINED; |
|
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
171 } |
|
984
dd128232e6ba
count connection once per request
Igor Sysoev <igor@sysoev.ru>
parents:
981
diff
changeset
|
172 |
| 2294 | 173 if (len > 65535) { |
|
1011
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
174 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
175 "the value of the \"%V\" variable " |
| 2294 | 176 "is more than 65535 bytes: \"%v\"", |
|
1011
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
177 &ctx->var, vv); |
|
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
178 return NGX_DECLINED; |
|
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
179 } |
|
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
180 |
| 2294 | 181 r->main->limit_req_set = 1; |
| 980 | 182 |
| 183 hash = ngx_crc32_short(vv->data, len); | |
| 184 | |
| 2294 | 185 ngx_shmtx_lock(&ctx->shpool->mutex); |
| 186 | |
| 187 ngx_http_limit_req_expire(ctx, 1); | |
| 188 | |
|
3779
57aecfdcac3d
an excess was logged as 0.000 if requests were limited without delay:
Igor Sysoev <igor@sysoev.ru>
parents:
3525
diff
changeset
|
189 rc = ngx_http_limit_req_lookup(lrcf, hash, vv->data, len, &excess); |
| 980 | 190 |
| 2313 | 191 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 2973 | 192 "limit_req: %i %ui.%03ui", rc, excess / 1000, excess % 1000); |
|
1026
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
193 |
| 2294 | 194 if (rc == NGX_BUSY) { |
| 195 ngx_shmtx_unlock(&ctx->shpool->mutex); | |
|
1012
11ffb8e4753f
stop rbtree search early if equal hash was found
Igor Sysoev <igor@sysoev.ru>
parents:
1011
diff
changeset
|
196 |
| 3185 | 197 ngx_log_error(lrcf->limit_log_level, r->connection->log, 0, |
|
2376
29d89920a749
*) add zone name while logging 503 error reason
Igor Sysoev <igor@sysoev.ru>
parents:
2375
diff
changeset
|
198 "limiting requests, excess: %ui.%03ui by zone \"%V\"", |
|
2716
d5896f6608e8
move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2612
diff
changeset
|
199 excess / 1000, excess % 1000, &lrcf->shm_zone->shm.name); |
| 980 | 200 |
| 201 return NGX_HTTP_SERVICE_UNAVAILABLE; | |
| 202 } | |
| 203 | |
| 2294 | 204 if (rc == NGX_AGAIN) { |
| 205 ngx_shmtx_unlock(&ctx->shpool->mutex); | |
| 206 | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
207 if (lrcf->nodelay) { |
|
2300
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
208 return NGX_DECLINED; |
| 2294 | 209 } |
| 210 | |
| 3185 | 211 ngx_log_error(lrcf->delay_log_level, r->connection->log, 0, |
|
2376
29d89920a749
*) add zone name while logging 503 error reason
Igor Sysoev <igor@sysoev.ru>
parents:
2375
diff
changeset
|
212 "delaying request, excess: %ui.%03ui, by zone \"%V\"", |
|
2716
d5896f6608e8
move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2612
diff
changeset
|
213 excess / 1000, excess % 1000, &lrcf->shm_zone->shm.name); |
|
2300
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
214 |
|
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
215 if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) { |
|
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
216 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
|
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
217 } |
|
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
218 |
|
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
219 r->read_event_handler = ngx_http_test_reading; |
|
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
220 r->write_event_handler = ngx_http_limit_req_delay; |
| 3525 | 221 ngx_add_timer(r->connection->write, |
| 222 (ngx_msec_t) excess * 1000 / ctx->rate); | |
|
2300
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
223 |
|
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
224 return NGX_AGAIN; |
| 2294 | 225 } |
| 226 | |
| 227 if (rc == NGX_OK) { | |
| 228 goto done; | |
| 229 } | |
| 230 | |
| 231 /* rc == NGX_DECLINED */ | |
| 232 | |
| 233 n = offsetof(ngx_rbtree_node_t, color) | |
| 234 + offsetof(ngx_http_limit_req_node_t, data) | |
| 235 + len; | |
| 236 | |
| 237 node = ngx_slab_alloc_locked(ctx->shpool, n); | |
| 238 if (node == NULL) { | |
| 239 | |
| 240 ngx_http_limit_req_expire(ctx, 0); | |
| 241 | |
| 242 node = ngx_slab_alloc_locked(ctx->shpool, n); | |
| 243 if (node == NULL) { | |
| 244 ngx_shmtx_unlock(&ctx->shpool->mutex); | |
| 245 return NGX_HTTP_SERVICE_UNAVAILABLE; | |
| 246 } | |
| 247 } | |
| 248 | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
249 lr = (ngx_http_limit_req_node_t *) &node->color; |
| 980 | 250 |
| 251 node->key = hash; | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
252 lr->len = (u_char) len; |
| 2294 | 253 |
| 254 tp = ngx_timeofday(); | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
255 lr->last = (ngx_msec_t) (tp->sec * 1000 + tp->msec); |
| 2294 | 256 |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
257 lr->excess = 0; |
|
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
258 ngx_memcpy(lr->data, vv->data, len); |
| 980 | 259 |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
260 ngx_rbtree_insert(&ctx->sh->rbtree, node); |
| 980 | 261 |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
262 ngx_queue_insert_head(&ctx->sh->queue, &lr->queue); |
| 2294 | 263 |
| 980 | 264 done: |
| 265 | |
| 2294 | 266 ngx_shmtx_unlock(&ctx->shpool->mutex); |
| 980 | 267 |
| 268 return NGX_DECLINED; | |
| 269 } | |
| 270 | |
| 271 | |
| 272 static void | |
| 2294 | 273 ngx_http_limit_req_delay(ngx_http_request_t *r) |
| 274 { | |
|
2972
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
275 ngx_event_t *wev; |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
276 |
| 2294 | 277 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 2973 | 278 "limit_req delay"); |
| 2294 | 279 |
|
2972
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
280 wev = r->connection->write; |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
281 |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
282 if (!wev->timedout) { |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
283 |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
284 if (ngx_handle_write_event(wev, 0) != NGX_OK) { |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
285 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
286 } |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
287 |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
288 return; |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
289 } |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
290 |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
291 wev->timedout = 0; |
|
c5ad288f851d
fix client write event handling in ngx_http_limit_req_module
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
292 |
| 2294 | 293 if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) { |
| 294 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 295 return; | |
| 296 } | |
| 297 | |
| 298 r->read_event_handler = ngx_http_block_reading; | |
| 299 r->write_event_handler = ngx_http_core_run_phases; | |
| 300 | |
| 301 ngx_http_core_run_phases(r); | |
| 302 } | |
| 303 | |
| 304 | |
| 305 static void | |
| 306 ngx_http_limit_req_rbtree_insert_value(ngx_rbtree_node_t *temp, | |
|
1026
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
307 ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
308 { |
| 2294 | 309 ngx_rbtree_node_t **p; |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
310 ngx_http_limit_req_node_t *lrn, *lrnt; |
|
1026
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
311 |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
312 for ( ;; ) { |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
313 |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
314 if (node->key < temp->key) { |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
315 |
|
1743
4fc402c3ec73
optimize rbtree initialization and insert
Igor Sysoev <igor@sysoev.ru>
parents:
1406
diff
changeset
|
316 p = &temp->left; |
|
1026
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
317 |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
318 } else if (node->key > temp->key) { |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
319 |
|
1743
4fc402c3ec73
optimize rbtree initialization and insert
Igor Sysoev <igor@sysoev.ru>
parents:
1406
diff
changeset
|
320 p = &temp->right; |
|
1026
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
321 |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
322 } else { /* node->key == temp->key */ |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
323 |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
324 lrn = (ngx_http_limit_req_node_t *) &node->color; |
|
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
325 lrnt = (ngx_http_limit_req_node_t *) &temp->color; |
|
1026
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
326 |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
327 p = (ngx_memn2cmp(lrn->data, lrnt->data, lrn->len, lrnt->len) < 0) |
|
1743
4fc402c3ec73
optimize rbtree initialization and insert
Igor Sysoev <igor@sysoev.ru>
parents:
1406
diff
changeset
|
328 ? &temp->left : &temp->right; |
|
4fc402c3ec73
optimize rbtree initialization and insert
Igor Sysoev <igor@sysoev.ru>
parents:
1406
diff
changeset
|
329 } |
|
1026
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
330 |
|
1743
4fc402c3ec73
optimize rbtree initialization and insert
Igor Sysoev <igor@sysoev.ru>
parents:
1406
diff
changeset
|
331 if (*p == sentinel) { |
|
4fc402c3ec73
optimize rbtree initialization and insert
Igor Sysoev <igor@sysoev.ru>
parents:
1406
diff
changeset
|
332 break; |
|
4fc402c3ec73
optimize rbtree initialization and insert
Igor Sysoev <igor@sysoev.ru>
parents:
1406
diff
changeset
|
333 } |
|
1026
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
334 |
|
1743
4fc402c3ec73
optimize rbtree initialization and insert
Igor Sysoev <igor@sysoev.ru>
parents:
1406
diff
changeset
|
335 temp = *p; |
|
1026
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
336 } |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
337 |
|
1743
4fc402c3ec73
optimize rbtree initialization and insert
Igor Sysoev <igor@sysoev.ru>
parents:
1406
diff
changeset
|
338 *p = node; |
|
1026
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
339 node->parent = temp; |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
340 node->left = sentinel; |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
341 node->right = sentinel; |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
342 ngx_rbt_red(node); |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
343 } |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
344 |
|
38be15c1379a
fix duplicate rbtree keys case
Igor Sysoev <igor@sysoev.ru>
parents:
1012
diff
changeset
|
345 |
| 2294 | 346 static ngx_int_t |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
347 ngx_http_limit_req_lookup(ngx_http_limit_req_conf_t *lrcf, ngx_uint_t hash, |
|
3779
57aecfdcac3d
an excess was logged as 0.000 if requests were limited without delay:
Igor Sysoev <igor@sysoev.ru>
parents:
3525
diff
changeset
|
348 u_char *data, size_t len, ngx_uint_t *ep) |
| 980 | 349 { |
| 2313 | 350 ngx_int_t rc, excess; |
| 2294 | 351 ngx_time_t *tp; |
| 352 ngx_msec_t now; | |
| 353 ngx_msec_int_t ms; | |
| 354 ngx_rbtree_node_t *node, *sentinel; | |
| 355 ngx_http_limit_req_ctx_t *ctx; | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
356 ngx_http_limit_req_node_t *lr; |
| 2294 | 357 |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
358 ctx = lrcf->shm_zone->data; |
| 2294 | 359 |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
360 node = ctx->sh->rbtree.root; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
361 sentinel = ctx->sh->rbtree.sentinel; |
| 980 | 362 |
| 2294 | 363 while (node != sentinel) { |
| 364 | |
| 365 if (hash < node->key) { | |
| 366 node = node->left; | |
| 367 continue; | |
| 368 } | |
| 369 | |
| 370 if (hash > node->key) { | |
| 371 node = node->right; | |
| 372 continue; | |
| 373 } | |
| 374 | |
| 375 /* hash == node->key */ | |
| 376 | |
| 377 do { | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
378 lr = (ngx_http_limit_req_node_t *) &node->color; |
| 980 | 379 |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
380 rc = ngx_memn2cmp(data, lr->data, len, (size_t) lr->len); |
| 2294 | 381 |
| 382 if (rc == 0) { | |
|
3779
57aecfdcac3d
an excess was logged as 0.000 if requests were limited without delay:
Igor Sysoev <igor@sysoev.ru>
parents:
3525
diff
changeset
|
383 ngx_queue_remove(&lr->queue); |
|
57aecfdcac3d
an excess was logged as 0.000 if requests were limited without delay:
Igor Sysoev <igor@sysoev.ru>
parents:
3525
diff
changeset
|
384 ngx_queue_insert_head(&ctx->sh->queue, &lr->queue); |
| 2294 | 385 |
| 386 tp = ngx_timeofday(); | |
| 980 | 387 |
| 2294 | 388 now = (ngx_msec_t) (tp->sec * 1000 + tp->msec); |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
389 ms = (ngx_msec_int_t) (now - lr->last); |
| 2294 | 390 |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
391 excess = lr->excess - ctx->rate * ngx_abs(ms) / 1000 + 1000; |
| 2294 | 392 |
| 3191 | 393 if (excess < 0) { |
| 394 excess = 0; | |
| 395 } | |
| 396 | |
|
3779
57aecfdcac3d
an excess was logged as 0.000 if requests were limited without delay:
Igor Sysoev <igor@sysoev.ru>
parents:
3525
diff
changeset
|
397 *ep = excess; |
|
57aecfdcac3d
an excess was logged as 0.000 if requests were limited without delay:
Igor Sysoev <igor@sysoev.ru>
parents:
3525
diff
changeset
|
398 |
|
3183
b87542338ac3
make limit_req to conform to the leaky bucket algorithm
Igor Sysoev <igor@sysoev.ru>
parents:
2973
diff
changeset
|
399 if ((ngx_uint_t) excess > lrcf->burst) { |
|
b87542338ac3
make limit_req to conform to the leaky bucket algorithm
Igor Sysoev <igor@sysoev.ru>
parents:
2973
diff
changeset
|
400 return NGX_BUSY; |
|
b87542338ac3
make limit_req to conform to the leaky bucket algorithm
Igor Sysoev <igor@sysoev.ru>
parents:
2973
diff
changeset
|
401 } |
|
b87542338ac3
make limit_req to conform to the leaky bucket algorithm
Igor Sysoev <igor@sysoev.ru>
parents:
2973
diff
changeset
|
402 |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
403 lr->excess = excess; |
|
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
404 lr->last = now; |
| 980 | 405 |
| 2313 | 406 if (excess) { |
| 2294 | 407 return NGX_AGAIN; |
| 408 } | |
| 980 | 409 |
| 2294 | 410 return NGX_OK; |
| 411 } | |
| 412 | |
| 413 node = (rc < 0) ? node->left : node->right; | |
| 414 | |
| 415 } while (node != sentinel && hash == node->key); | |
| 416 | |
| 417 break; | |
| 980 | 418 } |
| 419 | |
|
3779
57aecfdcac3d
an excess was logged as 0.000 if requests were limited without delay:
Igor Sysoev <igor@sysoev.ru>
parents:
3525
diff
changeset
|
420 *ep = 0; |
| 2294 | 421 |
| 422 return NGX_DECLINED; | |
| 423 } | |
| 424 | |
| 425 | |
| 426 static void | |
| 427 ngx_http_limit_req_expire(ngx_http_limit_req_ctx_t *ctx, ngx_uint_t n) | |
| 428 { | |
| 2313 | 429 ngx_int_t excess; |
| 2294 | 430 ngx_time_t *tp; |
| 431 ngx_msec_t now; | |
| 432 ngx_queue_t *q; | |
| 433 ngx_msec_int_t ms; | |
| 434 ngx_rbtree_node_t *node; | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
435 ngx_http_limit_req_node_t *lr; |
| 2294 | 436 |
| 437 tp = ngx_timeofday(); | |
| 438 | |
| 439 now = (ngx_msec_t) (tp->sec * 1000 + tp->msec); | |
| 440 | |
| 441 /* | |
| 442 * n == 1 deletes one or two zero rate entries | |
| 443 * n == 0 deletes oldest entry by force | |
| 444 * and one or two zero rate entries | |
| 445 */ | |
| 446 | |
| 447 while (n < 3) { | |
| 448 | |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
449 if (ngx_queue_empty(&ctx->sh->queue)) { |
| 2294 | 450 return; |
| 451 } | |
| 452 | |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
453 q = ngx_queue_last(&ctx->sh->queue); |
| 2294 | 454 |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
455 lr = ngx_queue_data(q, ngx_http_limit_req_node_t, queue); |
| 2294 | 456 |
| 457 if (n++ != 0) { | |
| 458 | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
459 ms = (ngx_msec_int_t) (now - lr->last); |
| 2294 | 460 ms = ngx_abs(ms); |
| 461 | |
| 462 if (ms < 60000) { | |
| 463 return; | |
| 464 } | |
| 465 | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
466 excess = lr->excess - ctx->rate * ms / 1000; |
| 2294 | 467 |
| 2313 | 468 if (excess > 0) { |
| 2294 | 469 return; |
| 470 } | |
| 471 } | |
| 472 | |
| 473 ngx_queue_remove(q); | |
| 474 | |
| 475 node = (ngx_rbtree_node_t *) | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
476 ((u_char *) lr - offsetof(ngx_rbtree_node_t, color)); |
| 2294 | 477 |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
478 ngx_rbtree_delete(&ctx->sh->rbtree, node); |
| 2294 | 479 |
| 480 ngx_slab_free_locked(ctx->shpool, node); | |
| 481 } | |
| 980 | 482 } |
| 483 | |
| 484 | |
| 485 static ngx_int_t | |
| 2294 | 486 ngx_http_limit_req_init_zone(ngx_shm_zone_t *shm_zone, void *data) |
| 980 | 487 { |
| 2294 | 488 ngx_http_limit_req_ctx_t *octx = data; |
|
993
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
489 |
|
2611
2bce3f6416c6
improve ngx_slab_alloc() error logging
Igor Sysoev <igor@sysoev.ru>
parents:
2376
diff
changeset
|
490 size_t len; |
| 2294 | 491 ngx_http_limit_req_ctx_t *ctx; |
| 980 | 492 |
|
993
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
493 ctx = shm_zone->data; |
|
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
494 |
|
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
495 if (octx) { |
|
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
496 if (ngx_strcmp(ctx->var.data, octx->var.data) != 0) { |
|
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
497 ngx_log_error(NGX_LOG_EMERG, shm_zone->shm.log, 0, |
| 2294 | 498 "limit_req \"%V\" uses the \"%V\" variable " |
|
993
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
499 "while previously it used the \"%V\" variable", |
|
2716
d5896f6608e8
move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2612
diff
changeset
|
500 &shm_zone->shm.name, &ctx->var, &octx->var); |
|
993
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
501 return NGX_ERROR; |
|
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
502 } |
|
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
503 |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
504 ctx->sh = octx->sh; |
| 2294 | 505 ctx->shpool = octx->shpool; |
|
993
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
506 |
|
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
507 return NGX_OK; |
|
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
508 } |
|
1b9a4d92173f
pass the inherited shm_zone data
Igor Sysoev <igor@sysoev.ru>
parents:
987
diff
changeset
|
509 |
| 2294 | 510 ctx->shpool = (ngx_slab_pool_t *) shm_zone->shm.addr; |
| 980 | 511 |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
512 if (shm_zone->shm.exists) { |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
513 ctx->sh = ctx->shpool->data; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
514 |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
515 return NGX_OK; |
| 980 | 516 } |
| 517 | |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
518 ctx->sh = ngx_slab_alloc(ctx->shpool, sizeof(ngx_http_limit_req_shctx_t)); |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
519 if (ctx->sh == NULL) { |
| 980 | 520 return NGX_ERROR; |
| 521 } | |
| 522 | |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
523 ctx->shpool->data = ctx->sh; |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
524 |
|
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
525 ngx_rbtree_init(&ctx->sh->rbtree, &ctx->sh->sentinel, |
| 2294 | 526 ngx_http_limit_req_rbtree_insert_value); |
| 527 | |
|
2720
b3b8c66bd520
support attaching to an existent Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
528 ngx_queue_init(&ctx->sh->queue); |
| 980 | 529 |
|
2716
d5896f6608e8
move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2612
diff
changeset
|
530 len = sizeof(" in limit_req zone \"\"") + shm_zone->shm.name.len; |
|
2611
2bce3f6416c6
improve ngx_slab_alloc() error logging
Igor Sysoev <igor@sysoev.ru>
parents:
2376
diff
changeset
|
531 |
|
2bce3f6416c6
improve ngx_slab_alloc() error logging
Igor Sysoev <igor@sysoev.ru>
parents:
2376
diff
changeset
|
532 ctx->shpool->log_ctx = ngx_slab_alloc(ctx->shpool, len); |
|
2bce3f6416c6
improve ngx_slab_alloc() error logging
Igor Sysoev <igor@sysoev.ru>
parents:
2376
diff
changeset
|
533 if (ctx->shpool->log_ctx == NULL) { |
|
2bce3f6416c6
improve ngx_slab_alloc() error logging
Igor Sysoev <igor@sysoev.ru>
parents:
2376
diff
changeset
|
534 return NGX_ERROR; |
|
2bce3f6416c6
improve ngx_slab_alloc() error logging
Igor Sysoev <igor@sysoev.ru>
parents:
2376
diff
changeset
|
535 } |
|
2bce3f6416c6
improve ngx_slab_alloc() error logging
Igor Sysoev <igor@sysoev.ru>
parents:
2376
diff
changeset
|
536 |
|
2bce3f6416c6
improve ngx_slab_alloc() error logging
Igor Sysoev <igor@sysoev.ru>
parents:
2376
diff
changeset
|
537 ngx_sprintf(ctx->shpool->log_ctx, " in limit_req zone \"%V\"%Z", |
|
2716
d5896f6608e8
move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2612
diff
changeset
|
538 &shm_zone->shm.name); |
|
2611
2bce3f6416c6
improve ngx_slab_alloc() error logging
Igor Sysoev <igor@sysoev.ru>
parents:
2376
diff
changeset
|
539 |
| 980 | 540 return NGX_OK; |
| 541 } | |
| 542 | |
| 543 | |
| 544 static void * | |
| 2294 | 545 ngx_http_limit_req_create_conf(ngx_conf_t *cf) |
| 980 | 546 { |
| 2294 | 547 ngx_http_limit_req_conf_t *conf; |
| 980 | 548 |
| 2294 | 549 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_limit_req_conf_t)); |
| 980 | 550 if (conf == NULL) { |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2720
diff
changeset
|
551 return NULL; |
| 980 | 552 } |
| 553 | |
| 554 /* | |
| 555 * set by ngx_pcalloc(): | |
| 556 * | |
| 557 * conf->shm_zone = NULL; | |
| 2375 | 558 * conf->burst = 0; |
|
2300
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
559 * conf->nodelay = 0; |
| 980 | 560 */ |
| 561 | |
| 3185 | 562 conf->limit_log_level = NGX_CONF_UNSET_UINT; |
| 563 | |
| 980 | 564 return conf; |
| 565 } | |
| 566 | |
| 567 | |
| 568 static char * | |
| 2294 | 569 ngx_http_limit_req_merge_conf(ngx_conf_t *cf, void *parent, void *child) |
| 980 | 570 { |
| 2294 | 571 ngx_http_limit_req_conf_t *prev = parent; |
| 572 ngx_http_limit_req_conf_t *conf = child; | |
| 980 | 573 |
| 574 if (conf->shm_zone == NULL) { | |
| 575 *conf = *prev; | |
| 576 } | |
| 577 | |
| 3185 | 578 ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level, |
| 579 NGX_LOG_ERR); | |
| 580 | |
| 581 conf->delay_log_level = (conf->limit_log_level == NGX_LOG_INFO) ? | |
| 582 NGX_LOG_INFO : conf->limit_log_level + 1; | |
| 583 | |
| 980 | 584 return NGX_CONF_OK; |
| 585 } | |
| 586 | |
| 587 | |
| 588 static char * | |
| 2294 | 589 ngx_http_limit_req_zone(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
| 980 | 590 { |
| 2294 | 591 u_char *p; |
| 592 size_t size, len; | |
| 593 ngx_str_t *value, name, s; | |
| 594 ngx_int_t rate, scale; | |
| 595 ngx_uint_t i; | |
| 596 ngx_shm_zone_t *shm_zone; | |
| 597 ngx_http_limit_req_ctx_t *ctx; | |
| 980 | 598 |
| 599 value = cf->args->elts; | |
| 600 | |
| 2294 | 601 ctx = NULL; |
| 602 size = 0; | |
| 603 rate = 1; | |
| 604 scale = 1; | |
| 605 name.len = 0; | |
| 606 | |
| 607 for (i = 1; i < cf->args->nelts; i++) { | |
| 608 | |
| 609 if (ngx_strncmp(value[i].data, "zone=", 5) == 0) { | |
| 610 | |
| 611 name.data = value[i].data + 5; | |
| 612 | |
| 613 p = (u_char *) ngx_strchr(name.data, ':'); | |
| 614 | |
| 615 if (p) { | |
|
2716
d5896f6608e8
move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2612
diff
changeset
|
616 *p = '\0'; |
|
d5896f6608e8
move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2612
diff
changeset
|
617 |
| 2294 | 618 name.len = p - name.data; |
| 619 | |
| 620 p++; | |
| 621 | |
| 622 s.len = value[i].data + value[i].len - p; | |
| 623 s.data = p; | |
| 624 | |
| 625 size = ngx_parse_size(&s); | |
| 626 if (size > 8191) { | |
| 627 continue; | |
| 628 } | |
| 629 } | |
| 630 | |
| 631 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 632 "invalid zone size \"%V\"", &value[i]); | |
| 633 return NGX_CONF_ERROR; | |
| 634 } | |
| 635 | |
| 636 if (ngx_strncmp(value[i].data, "rate=", 5) == 0) { | |
| 637 | |
| 638 len = value[i].len; | |
| 639 p = value[i].data + len - 3; | |
| 987 | 640 |
| 2294 | 641 if (ngx_strncmp(p, "r/s", 3) == 0) { |
| 642 scale = 1; | |
| 643 len -= 3; | |
| 644 | |
| 645 } else if (ngx_strncmp(p, "r/m", 3) == 0) { | |
| 646 scale = 60; | |
| 647 len -= 3; | |
| 648 } | |
| 649 | |
| 650 rate = ngx_atoi(value[i].data + 5, len - 5); | |
| 651 if (rate <= NGX_ERROR) { | |
| 652 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 653 "invalid rate \"%V\"", &value[i]); | |
| 654 return NGX_CONF_ERROR; | |
| 655 } | |
| 656 | |
| 657 continue; | |
| 658 } | |
| 659 | |
| 660 if (value[i].data[0] == '$') { | |
| 987 | 661 |
| 2294 | 662 value[i].len--; |
| 663 value[i].data++; | |
| 664 | |
| 665 ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_limit_req_ctx_t)); | |
| 666 if (ctx == NULL) { | |
| 667 return NGX_CONF_ERROR; | |
| 668 } | |
| 669 | |
| 670 ctx->index = ngx_http_get_variable_index(cf, &value[i]); | |
| 671 if (ctx->index == NGX_ERROR) { | |
| 672 return NGX_CONF_ERROR; | |
| 673 } | |
| 674 | |
| 675 ctx->var = value[i]; | |
| 676 | |
| 677 continue; | |
| 678 } | |
| 679 | |
| 680 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 681 "invalid parameter \"%V\"", &value[i]); | |
| 987 | 682 return NGX_CONF_ERROR; |
| 683 } | |
| 684 | |
| 2294 | 685 if (name.len == 0 || size == 0) { |
| 686 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 687 "\"%V\" must have \"zone\" parameter", | |
| 688 &cmd->name); | |
| 987 | 689 return NGX_CONF_ERROR; |
| 690 } | |
| 691 | |
| 2294 | 692 if (ctx == NULL) { |
| 980 | 693 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 2294 | 694 "no variable is defined for limit_req_zone \"%V\"", |
| 695 &cmd->name); | |
| 980 | 696 return NGX_CONF_ERROR; |
| 697 } | |
| 698 | |
| 2313 | 699 ctx->rate = rate * 1000 / scale; |
| 980 | 700 |
| 2294 | 701 shm_zone = ngx_shared_memory_add(cf, &name, size, |
| 702 &ngx_http_limit_req_module); | |
| 980 | 703 if (shm_zone == NULL) { |
| 704 return NGX_CONF_ERROR; | |
| 705 } | |
| 706 | |
| 987 | 707 if (shm_zone->data) { |
| 708 ctx = shm_zone->data; | |
| 709 | |
| 710 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 2294 | 711 "limit_req_zone \"%V\" is already bound to variable \"%V\"", |
| 712 &value[1], &ctx->var); | |
| 987 | 713 return NGX_CONF_ERROR; |
| 714 } | |
| 715 | |
| 2294 | 716 shm_zone->init = ngx_http_limit_req_init_zone; |
| 987 | 717 shm_zone->data = ctx; |
| 980 | 718 |
| 719 return NGX_CONF_OK; | |
| 720 } | |
| 721 | |
| 722 | |
| 723 static char * | |
| 2294 | 724 ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
| 980 | 725 { |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
726 ngx_http_limit_req_conf_t *lrcf = conf; |
| 980 | 727 |
|
2300
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
728 ngx_int_t burst; |
|
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
729 ngx_str_t *value, s; |
|
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
730 ngx_uint_t i; |
| 2294 | 731 |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
732 if (lrcf->shm_zone) { |
| 2294 | 733 return "is duplicate"; |
| 734 } | |
| 980 | 735 |
| 736 value = cf->args->elts; | |
| 737 | |
| 2294 | 738 burst = 0; |
| 739 | |
| 740 for (i = 1; i < cf->args->nelts; i++) { | |
| 741 | |
| 742 if (ngx_strncmp(value[i].data, "zone=", 5) == 0) { | |
| 743 | |
| 744 s.len = value[i].len - 5; | |
| 745 s.data = value[i].data + 5; | |
| 746 | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
747 lrcf->shm_zone = ngx_shared_memory_add(cf, &s, 0, |
| 2294 | 748 &ngx_http_limit_req_module); |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
749 if (lrcf->shm_zone == NULL) { |
| 2294 | 750 return NGX_CONF_ERROR; |
| 751 } | |
| 752 | |
| 753 continue; | |
| 754 } | |
| 755 | |
| 756 if (ngx_strncmp(value[i].data, "burst=", 6) == 0) { | |
| 757 | |
|
2300
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
758 burst = ngx_atoi(value[i].data + 6, value[i].len - 6); |
| 2294 | 759 if (burst <= 0) { |
| 760 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 761 "invalid burst rate \"%V\"", &value[i]); | |
| 762 return NGX_CONF_ERROR; | |
| 763 } | |
| 764 | |
| 765 continue; | |
| 766 } | |
| 767 | |
|
2300
159136c9808d
*) correct leaky bucket implementation
Igor Sysoev <igor@sysoev.ru>
parents:
2294
diff
changeset
|
768 if (ngx_strncmp(value[i].data, "nodelay", 7) == 0) { |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
769 lrcf->nodelay = 1; |
| 2294 | 770 continue; |
| 771 } | |
| 772 | |
| 773 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 774 "invalid parameter \"%V\"", &value[i]); | |
| 980 | 775 return NGX_CONF_ERROR; |
| 776 } | |
| 777 | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
778 if (lrcf->shm_zone == NULL) { |
| 980 | 779 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 2294 | 780 "\"%V\" must have \"zone\" parameter", |
| 781 &cmd->name); | |
| 980 | 782 return NGX_CONF_ERROR; |
| 783 } | |
| 784 | |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
785 if (lrcf->shm_zone->data == NULL) { |
|
1011
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
786 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 2294 | 787 "unknown limit_req_zone \"%V\"", |
|
2716
d5896f6608e8
move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2612
diff
changeset
|
788 &lrcf->shm_zone->shm.name); |
|
1011
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
789 return NGX_CONF_ERROR; |
|
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
790 } |
|
19118c44303f
test length of variable and number of connections
Igor Sysoev <igor@sysoev.ru>
parents:
1002
diff
changeset
|
791 |
|
2374
7b11f9a1bfe1
rename "lz" to "lr" in variable names
Igor Sysoev <igor@sysoev.ru>
parents:
2313
diff
changeset
|
792 lrcf->burst = burst * 1000; |
| 980 | 793 |
| 794 return NGX_CONF_OK; | |
| 795 } | |
| 796 | |
| 797 | |
| 798 static ngx_int_t | |
| 2294 | 799 ngx_http_limit_req_init(ngx_conf_t *cf) |
| 980 | 800 { |
| 801 ngx_http_handler_pt *h; | |
| 802 ngx_http_core_main_conf_t *cmcf; | |
| 803 | |
| 804 cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module); | |
| 805 | |
| 806 h = ngx_array_push(&cmcf->phases[NGX_HTTP_PREACCESS_PHASE].handlers); | |
| 807 if (h == NULL) { | |
| 808 return NGX_ERROR; | |
| 809 } | |
| 810 | |
| 2294 | 811 *h = ngx_http_limit_req_handler; |
| 980 | 812 |
| 813 return NGX_OK; | |
| 814 } |