aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2007-05-21 14:09:12 +0000
committerIgor Sysoev <igor@sysoev.ru>2007-05-21 14:09:12 +0000
commitc02ed54c4fadfb9584175aad2739b7901e67406d (patch)
tree807a6c68f3bf193abc4328b92188a13c35185dc1 /src/http/ngx_http.c
parent35921283df0eae8ae7a3b9a583f2e9d99f31c19b (diff)
downloadnginx-c02ed54c4fadfb9584175aad2739b7901e67406d.tar.gz
nginx-c02ed54c4fadfb9584175aad2739b7901e67406d.zip
use stable search where it is required
Diffstat (limited to 'src/http/ngx_http.c')
-rw-r--r--src/http/ngx_http.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 7a1eb89b3..46e576a90 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -19,8 +19,7 @@ static ngx_int_t ngx_http_add_names(ngx_conf_t *cf,
static char *ngx_http_merge_locations(ngx_conf_t *cf,
ngx_array_t *locations, void **loc_conf, ngx_http_module_t *module,
ngx_uint_t ctx_index);
-static int ngx_libc_cdecl ngx_http_cmp_conf_in_addrs(const void *one,
- const void *two);
+static int ngx_http_cmp_conf_in_addrs(const void *one, const void *two);
static int ngx_libc_cdecl ngx_http_cmp_dns_wildcards(const void *one,
const void *two);
@@ -599,8 +598,8 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
in_port = in_ports.elts;
for (p = 0; p < in_ports.nelts; p++) {
- ngx_qsort(in_port[p].addrs.elts, (size_t) in_port[p].addrs.nelts,
- sizeof(ngx_http_conf_in_addr_t), ngx_http_cmp_conf_in_addrs);
+ ngx_sort(in_port[p].addrs.elts, (size_t) in_port[p].addrs.nelts,
+ sizeof(ngx_http_conf_in_addr_t), ngx_http_cmp_conf_in_addrs);
/*
* check whether all name-based servers have the same configuraiton
@@ -1027,7 +1026,7 @@ ngx_http_merge_locations(ngx_conf_t *cf, ngx_array_t *locations,
}
-static int ngx_libc_cdecl
+static int
ngx_http_cmp_conf_in_addrs(const void *one, const void *two)
{
ngx_http_conf_in_addr_t *first, *second;