Mercurial > hg > nginx-vendor-1-0
diff src/http/ngx_http_upstream_round_robin.c @ 336:1c519aff5c0c NGINX_0_6_12
nginx 0.6.12
*) Change: mail proxy was split on three modules: pop3, imap and smtp.
*) Feature: the --without-mail_pop3_module, --without-mail_imap_module,
and --without-mail_smtp_module configuration parameters.
*) Feature: the "smtp_greeting_delay" and "smtp_client_buffer"
directives of the ngx_mail_smtp_module.
*) Bugfix: the trailing wildcards did not work; bug appeared in 0.6.9.
*) Bugfix: nginx could not start on Solaris if the shared PCRE library
located in non-standard place was used.
*) Bugfix: the "proxy_hide_header" and "fastcgi_hide_header" directives
did not hide response header lines whose name was longer than 32
characters.
Thanks to Manlio Perillo.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Fri, 21 Sep 2007 00:00:00 +0400 |
parents | 3f511163d908 |
children | 10cc350ed8a1 |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream_round_robin.c +++ b/src/http/ngx_http_upstream_round_robin.c @@ -136,7 +136,7 @@ ngx_http_upstream_init_round_robin(ngx_c if (us->port == 0 && us->default_port == 0) { ngx_log_error(NGX_LOG_EMERG, cf->log, 0, "no port in upstream \"%V\" in %s:%ui", - &us->host, us->file_name.data, us->line); + &us->host, us->file_name, us->line); return NGX_ERROR; } @@ -149,7 +149,7 @@ ngx_http_upstream_init_round_robin(ngx_c if (u.err) { ngx_log_error(NGX_LOG_EMERG, cf->log, 0, "%s in upstream \"%V\" in %s:%ui", - u.err, &us->host, us->file_name.data, us->line); + u.err, &us->host, us->file_name, us->line); } return NGX_ERROR; @@ -498,7 +498,7 @@ ngx_http_upstream_get_peer(ngx_http_upst } if (peer[n].current_weight * 1000 / peer[i].current_weight - >= peer[n].weight * 1000 / peer[i].weight) + > peer[n].weight * 1000 / peer[i].weight) { return n; }