nginx-0.3.24-RELEASE importrelease-0.3.24

    *) Workaround: for bug in FreeBSD kqueue.

    *) Bugfix: now a response generated by the "post_action" directive is
       not transferred to a client.

    *) Bugfix: the memory leaks were occurring if many log files were used.

    *) Bugfix: the first "proxy_redirect" directive was working inside one
       location.

    *) Bugfix: on 64-bit platforms segmentation fault may occurred on start
       if the many names were used in the "server_name" directives; the bug
       had appeared in 0.3.18.

1 files changed, 3 insertions, 14 deletions

diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index 589eb0e00..ab097c049 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -670,20 +670,9 @@ ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name)
 
     name->len = cycle->root.len + old.len;
 
-    if (cycle->connections) {
-        name->data = ngx_palloc(cycle->pool, name->len + 1);
-        if (name->data == NULL) {
-            return  NGX_ERROR;
-        }
-
-    } else {
-
-        /* the init_cycle */
-
-        name->data = ngx_alloc(name->len + 1, cycle->log);
-        if (name->data == NULL) {
-            return  NGX_ERROR;
-        }
+    name->data = ngx_palloc(cycle->pool, name->len + 1);
+    if (name->data == NULL) {
+        return  NGX_ERROR;
     }
 
     p = ngx_cpymem(name->data, cycle->root.data, cycle->root.len),