From 7f487a0a1befe2003e744b110d2c374dfd294999 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Wed, 24 Dec 2008 16:21:57 +0000
Subject: Changes with nginx 0.7.30                                        24
 Dec 2008

    *) Bugfix: a segmentation fault occurred in worker process, if
       variables were used in the "fastcgi_pass" and "proxy_pass"
       directives and host name must be resolved; the bug had appeared in
       0.7.29.
---
 src/core/nginx.h                           | 2 +-
 src/http/modules/ngx_http_fastcgi_module.c | 2 +-
 src/http/modules/ngx_http_proxy_module.c   | 2 +-
 src/http/modules/perl/nginx.pm             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/core/nginx.h b/src/core/nginx.h
index 3e82676c9..55b081856 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VERSION      "0.7.29"
+#define NGINX_VERSION      "0.7.30"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define NGINX_VAR          "NGINX"
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 6e4d956d8..201ac2a21 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -512,7 +512,7 @@ ngx_http_fastcgi_eval(ngx_http_request_t *r, ngx_http_fastcgi_loc_conf_t *flcf)
         return NGX_ERROR;
     }
 
-    if (u.addrs[0].sockaddr) {
+    if (u.addrs && u.addrs[0].sockaddr) {
         r->upstream->resolved->sockaddr = u.addrs[0].sockaddr;
         r->upstream->resolved->socklen = u.addrs[0].socklen;
         r->upstream->resolved->naddrs = 1;
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 2bf58ab68..e8c19bb16 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -614,7 +614,7 @@ ngx_http_proxy_eval(ngx_http_request_t *r, ngx_http_proxy_ctx_t *ctx,
         return NGX_ERROR;
     }
 
-    if (u.addrs[0].sockaddr) {
+    if (u.addrs && u.addrs[0].sockaddr) {
         r->upstream->resolved->sockaddr = u.addrs[0].sockaddr;
         r->upstream->resolved->socklen = u.addrs[0].socklen;
         r->upstream->resolved->naddrs = 1;
diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm
index 668a472f6..49642a997 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.29';
+our $VERSION = '0.7.30';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);
-- 
cgit v1.2.1