diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-12-11 15:12:34 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2006-12-11 15:12:34 +0000 |
| commit | 27175fa568b752df7e49b04fecdf6e473d72a30b (patch) | |
| tree | 03e097e98425c9dbef1d87fbd29bd22a3650bd40 | |
| parent | e1cf9c10bedcb5f1d570d0243e029473831f3031 (diff) | |
| download | nginx-0.5.2.tar.gz | |
CHANGES not updated for this versionv0.5.2
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/http/modules/perl/nginx.pm | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_upstream.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index 392827526..2a40c8240 100644 --- 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" diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index c74ffd7bd..9a3868c87 100644 --- 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); diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index a358ce248..a917dcf49 100644 --- 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, ngx_url_t *u, ngx_uint_t flags) 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) |