changeset 1580:c9a0f82deb7c

fix segfault if no server_name was defined
author Igor Sysoev <igor@sysoev.ru>
date Wed, 17 Oct 2007 13:22:26 +0000
parents aa1835ad46ba
children 81774dc3db28
files src/http/ngx_http_core_module.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2292,9 +2292,12 @@ ngx_http_core_merge_srv_conf(ngx_conf_t 
             return NGX_CONF_ERROR;
         }
 
+#if (NGX_PCRE)
+        sn->regex = NULL;
+#endif
+        sn->core_srv_conf = conf;
         sn->name.len = conf->server_name.len;
         sn->name.data = conf->server_name.data;
-        sn->core_srv_conf = conf;
     }
 
     ngx_conf_merge_size_value(conf->connection_pool_size,