Mercurial > hg > nginx

changeset 3284:c025e3525144

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix segfault if no rules are defined, introduced in r3279
author Igor Sysoev <igor@sysoev.ru>
date Tue, 03 Nov 2009 16:04:07 +0000
parents 52b1624b93c2
children 3ba82806ec9a
files src/http/modules/ngx_http_access_module.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_access_module.c
+++ b/src/http/modules/ngx_http_access_module.c
@@ -113,7 +113,7 @@ ngx_http_access_handler(ngx_http_request
 
 #if (NGX_HAVE_INET6)
 
-    if (r->connection->sockaddr->sa_family == AF_INET6) {
+    if (alcf->rules6 && r->connection->sockaddr->sa_family == AF_INET6) {
         u_char               *p;
         in_addr_t             addr;
         struct sockaddr_in6  *sin6;
@@ -134,7 +134,7 @@ ngx_http_access_handler(ngx_http_request
 
 #endif
 
-    if (r->connection->sockaddr->sa_family == AF_INET) {
+    if (alcf->rules && r->connection->sockaddr->sa_family == AF_INET) {
         sin = (struct sockaddr_in *) r->connection->sockaddr;
         return ngx_http_access_inet(r, alcf, sin->sin_addr.s_addr);
     }