Mercurial > hg > nginx-quic
annotate src/http/ngx_http_upstream_round_robin.h @ 4666:0bb016b1fd2d stable-1.2
Merge of r4621, r4641: filter_finalize fixes.
*) Fixed possible request hang with filter finalization.
With r->filter_finalize set the ngx_http_finalize_connection() wasn't
called from ngx_http_finalize_request() called with NGX_OK, resulting in
r->main->count not being decremented, thus causing request hang in some
rare situations.
Patch by Yichun Zhang (agentzh).
*) Fixed segfault with filter_finalize introduced in r4621 (1.3.0).
See the following thread for more details:
http://mailman.nginx.org/pipermail/nginx-devel/2012-May/002190.html
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 04 Jun 2012 11:15:46 +0000 |
parents | d620f497c50f |
children | c90801720a0c |
rev | line source |
---|---|
884 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4412 | 4 * Copyright (C) Nginx, Inc. |
884 | 5 */ |
6 | |
7 | |
8 #ifndef _NGX_HTTP_UPSTREAM_ROUND_ROBIN_H_INCLUDED_ | |
9 #define _NGX_HTTP_UPSTREAM_ROUND_ROBIN_H_INCLUDED_ | |
10 | |
11 | |
12 #include <ngx_config.h> | |
13 #include <ngx_core.h> | |
14 #include <ngx_http.h> | |
15 | |
16 | |
17 typedef struct { | |
18 struct sockaddr *sockaddr; | |
19 socklen_t socklen; | |
20 ngx_str_t name; | |
21 | |
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
22 ngx_int_t current_weight; |
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
23 ngx_int_t weight; |
884 | 24 |
25 ngx_uint_t fails; | |
26 time_t accessed; | |
4207
4fc91bae6f83
Better recheck of dead upstream servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3264
diff
changeset
|
27 time_t checked; |
884 | 28 |
29 ngx_uint_t max_fails; | |
30 time_t fail_timeout; | |
31 | |
32 ngx_uint_t down; /* unsigned down:1; */ | |
33 | |
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
34 #if (NGX_HTTP_SSL) |
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
954
diff
changeset
|
35 ngx_ssl_session_t *ssl_session; /* local to a process */ |
884 | 36 #endif |
37 } ngx_http_upstream_rr_peer_t; | |
38 | |
39 | |
1378 | 40 typedef struct ngx_http_upstream_rr_peers_s ngx_http_upstream_rr_peers_t; |
41 | |
42 struct ngx_http_upstream_rr_peers_s { | |
43 ngx_uint_t single; /* unsigned single:1; */ | |
884 | 44 ngx_uint_t number; |
45 ngx_uint_t last_cached; | |
46 | |
47 /* ngx_mutex_t *mutex; */ | |
48 ngx_connection_t **cached; | |
49 | |
50 ngx_str_t *name; | |
51 | |
1378 | 52 ngx_http_upstream_rr_peers_t *next; |
53 | |
884 | 54 ngx_http_upstream_rr_peer_t peer[1]; |
1378 | 55 }; |
884 | 56 |
57 | |
58 typedef struct { | |
59 ngx_http_upstream_rr_peers_t *peers; | |
60 ngx_uint_t current; | |
954
f16424aa5d89
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
884
diff
changeset
|
61 uintptr_t *tried; |
884 | 62 uintptr_t data; |
63 } ngx_http_upstream_rr_peer_data_t; | |
64 | |
65 | |
66 ngx_int_t ngx_http_upstream_init_round_robin(ngx_conf_t *cf, | |
67 ngx_http_upstream_srv_conf_t *us); | |
68 ngx_int_t ngx_http_upstream_init_round_robin_peer(ngx_http_request_t *r, | |
69 ngx_http_upstream_srv_conf_t *us); | |
1658 | 70 ngx_int_t ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r, |
71 ngx_http_upstream_resolved_t *ur); | |
884 | 72 ngx_int_t ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, |
73 void *data); | |
74 void ngx_http_upstream_free_round_robin_peer(ngx_peer_connection_t *pc, | |
75 void *data, ngx_uint_t state); | |
76 | |
77 #if (NGX_HTTP_SSL) | |
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
954
diff
changeset
|
78 ngx_int_t |
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
954
diff
changeset
|
79 ngx_http_upstream_set_round_robin_peer_session(ngx_peer_connection_t *pc, |
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
954
diff
changeset
|
80 void *data); |
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
954
diff
changeset
|
81 void ngx_http_upstream_save_round_robin_peer_session(ngx_peer_connection_t *pc, |
884 | 82 void *data); |
83 #endif | |
84 | |
85 | |
86 #endif /* _NGX_HTTP_UPSTREAM_ROUND_ROBIN_H_INCLUDED_ */ |