Mercurial > hg > nginx-vendor-0-8

comparison src/http/ngx_http_upstream_round_robin.c @ 372:6639b93e81b2 NGINX_0_6_30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.6.30 *) Change: now if an "include" directive pattern does not match any file, then nginx does not issue an error. *) Feature: now the time in directives may be specified without spaces, for example, "1h50m". *) Bugfix: memory leaks if the "ssl_verify_client" directive was on. Thanks to Chavelle Vincent. *) Bugfix: the "sub_filter" directive might set text to change into output. *) Bugfix: the "error_page" directive did not take into account arguments in redirected URI. *) Bugfix: now nginx always opens files in binary mode under Cygwin. *) Bugfix: nginx could not be built on OpenBSD; bug appeared in 0.6.15.
author Igor Sysoev <http://sysoev.ru>
date Tue, 29 Apr 2008 00:00:00 +0400
parents a39aab45a53f
children 984bb0b1399b
comparison
equal deleted inserted replaced
371:b6a2a305fdad 372:6639b93e81b2
7 #include <ngx_config.h> 7 #include <ngx_config.h>
8 #include <ngx_core.h> 8 #include <ngx_core.h>
9 #include <ngx_http.h> 9 #include <ngx_http.h>
10 10
11 11
12 static int ngx_http_upstream_cmp_servers(const void *one, const void *two); 12 static ngx_int_t ngx_http_upstream_cmp_servers(const void *one,
13 const void *two);
13 static ngx_uint_t 14 static ngx_uint_t
14 ngx_http_upstream_get_peer(ngx_http_upstream_rr_peers_t *peers); 15 ngx_http_upstream_get_peer(ngx_http_upstream_rr_peers_t *peers);
15 16
16 17
17 ngx_int_t 18 ngx_int_t
183 184
184 return NGX_OK; 185 return NGX_OK;
185 } 186 }
186 187
187 188
188 static int 189 static ngx_int_t
189 ngx_http_upstream_cmp_servers(const void *one, const void *two) 190 ngx_http_upstream_cmp_servers(const void *one, const void *two)
190 { 191 {
191 ngx_http_upstream_rr_peer_t *first, *second; 192 ngx_http_upstream_rr_peer_t *first, *second;
192 193
193 first = (ngx_http_upstream_rr_peer_t *) one; 194 first = (ngx_http_upstream_rr_peer_t *) one;