diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CHANGES.ru | 6 | ||||
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_inet.c | 3 | ||||
| -rw-r--r-- | src/http/modules/perl/nginx.pm | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 6 |
6 files changed, 21 insertions, 4 deletions
@@ -1,4 +1,10 @@ +Changes with nginx 0.7.37 21 Feb 2009 + + *) Bugfix: directive using upstreams did not work; the bug had appeared + in 0.7.36. + + Changes with nginx 0.7.36 21 Feb 2009 *) Feature: a preliminary IPv6 support; the "listen" directive of the diff --git a/CHANGES.ru b/CHANGES.ru index 76f95f39b..9d6a824f3 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,10 @@ +Изменения в nginx 0.7.37 21.02.2009 + + *) Исправление: директивы, использующие upstream'ы, не работали; ошибка + появилась в 0.7.36. + + Изменения в nginx 0.7.36 21.02.2009 *) Добавление: предварительная поддержка IPv6; директива listen модуля diff --git a/src/core/nginx.h b/src/core/nginx.h index a7576049b..69ae5c4dd 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VERSION "0.7.36" +#define NGINX_VERSION "0.7.37" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c index 7ccf6644d..497d84a3c 100644 --- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -704,8 +704,7 @@ ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u) /* AF_INET only */ - sin = (struct sockaddr_in *) &u->sockaddr; - port = sin->sin_port; + port = htons(u->port); in_addr = inet_addr((char *) host); diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index d33310e27..cfe8ef511 100644 --- a/src/http/modules/perl/nginx.pm +++ b/src/http/modules/perl/nginx.pm @@ -47,7 +47,7 @@ our @EXPORT = qw( HTTP_INSUFFICIENT_STORAGE ); -our $VERSION = '0.7.36'; +our $VERSION = '0.7.37'; require XSLoader; XSLoader::load('nginx', $VERSION); diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index a54a1217e..22a81dbb0 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -2790,9 +2790,15 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) #endif sin->sin_addr.s_addr = INADDR_ANY; + ls->socklen = sizeof(struct sockaddr_in); + ls->conf.backlog = NGX_LISTEN_BACKLOG; ls->conf.rcvbuf = -1; ls->conf.sndbuf = -1; + ls->conf.wildcard = 1; + + (void) ngx_sock_ntop((struct sockaddr *) &ls->sockaddr, ls->conf.addr, + NGX_SOCKADDR_STRLEN, 1); } if (conf->server_name.data == NULL) { |