diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-05-28 14:56:45 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2007-05-28 14:56:45 +0000 |
| commit | 7b2348282df005c03f11798b5d64cf9c13c35518 (patch) | |
| tree | c929c61be3d02e967e4d196a37acdfc52f2f6ef9 /src/http/ngx_http.c | |
| parent | d7127be32835b36710aee355677f37777046bd13 (diff) | |
| download | nginx-7b2348282df005c03f11798b5d64cf9c13c35518.tar.gz | |
Changes with nginx 0.5.21 28 May 2007v0.5.21
*) Bugfix: if server has more than about ten locations, then regex
locations may be choosen not in that order as they were specified.
*) Bugfix: a worker process may got caught in an endless loop on 64-bit
platform, if the 33-rd or next in succession backend has failed.
Thanks to Anton Povarov.
*) Bugfix: a bus error might occur on Solaris/sparc64 if the PCRE
library was used.
Thanks to Andrei Nigmatulin.
*) Bugfix: in the HTTPS protocol in the "proxy_pass" directive.
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 9 |
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; |