From bf922b4d14f5c17369b015080fb9a5a571119c9d Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sat, 21 Mar 2009 18:02:55 +0100
Subject: [PATCH] upstream nginx-0.7.37

---
 nginx/CHANGES                         | 6 ++++++
 nginx/CHANGES.ru                      | 6 ++++++
 nginx/src/core/nginx.h                | 2 +-
 nginx/src/core/ngx_inet.c             | 3 +--
 nginx/src/http/modules/perl/nginx.pm  | 2 +-
 nginx/src/http/ngx_http_core_module.c | 6 ++++++
 6 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/nginx/CHANGES b/nginx/CHANGES
index ff91948..0532d44 100644
--- a/nginx/CHANGES
+++ b/nginx/CHANGES
@@ -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/nginx/CHANGES.ru b/nginx/CHANGES.ru
index 76f95f3..9d6a824 100644
--- a/nginx/CHANGES.ru
+++ b/nginx/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/nginx/src/core/nginx.h b/nginx/src/core/nginx.h
index a757604..69ae5c4 100644
--- a/nginx/src/core/nginx.h
+++ b/nginx/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/nginx/src/core/ngx_inet.c b/nginx/src/core/ngx_inet.c
index 7ccf664..497d84a 100644
--- a/nginx/src/core/ngx_inet.c
+++ b/nginx/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/nginx/src/http/modules/perl/nginx.pm b/nginx/src/http/modules/perl/nginx.pm
index d33310e..cfe8ef5 100644
--- a/nginx/src/http/modules/perl/nginx.pm
+++ b/nginx/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/nginx/src/http/ngx_http_core_module.c b/nginx/src/http/ngx_http_core_module.c
index a54a121..22a81db 100644
--- a/nginx/src/http/ngx_http_core_module.c
+++ b/nginx/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) {
-- 
2.20.1