Mercurial > hg > nginx-vendor-0-7
changeset 264:4de4f8bc5d07 NGINX_0_5_2
nginx 0.5.2
*) Bugfix: if the "proxy_pass" directive used the name of the
"upstream" block, then nginx tried to resolve the name; bug appeared
in 0.5.1.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 11 Dec 2006 00:00:00 +0300 |
parents | 34f7e991e4f7 |
children | 3d4634b3b321 |
files | src/core/nginx.h src/http/modules/perl/nginx.pm src/http/ngx_http_upstream.c |
diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VERSION "0.5.1" +#define NGINX_VERSION "0.5.2" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX"
--- a/src/http/modules/perl/nginx.pm +++ b/src/http/modules/perl/nginx.pm @@ -17,7 +17,7 @@ our @EXPORT = qw( HTTP_SERVER_ERROR ); -our $VERSION = '0.5.1'; +our $VERSION = '0.5.2'; require XSLoader; XSLoader::load('nginx', $VERSION);
--- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -2843,7 +2843,7 @@ ngx_http_upstream_add(ngx_conf_t *cf, ng uscfp = umcf->upstreams.elts; for (i = 0; i < umcf->upstreams.nelts; i++) { - if (uscfp[i]->port != u->portn + if ((uscfp[i]->port && uscfp[i]->port != u->portn) || uscfp[i]->host.len != u->host.len || ngx_strncasecmp(uscfp[i]->host.data, u->host.data, u->host.len) != 0)