Mercurial > hg > nginx

comparison src/core/ngx_conf_file.c @ 455:295d97d70c69 release-0.1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.1.2-RELEASE import *) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS options in configure. *) Feature: the server_name directive supports *.domain.tld. *) Bugfix: the portability improvements. *) Bugfix: if configuration file was set in command line, the reconfiguration was impossible; the bug had appeared in 0.1.1. *) Bugfix: proxy module may get caught in an endless loop when sendfile is not used. *) Bugfix: with sendfile the response was not recoded according to the charset module directives; the bug had appeared in 0.1.1. *) Bugfix: very seldom bug in the kqueue processing. *) Bugfix: the gzip module compressed the proxied responses that was already compressed.
author Igor Sysoev <igor@sysoev.ru>
date Thu, 21 Oct 2004 15:34:38 +0000
parents 3b1e8c9df9ad
children a88a3e4e158f
comparison
equal deleted inserted replaced
454:2ff9cff0f469 455:295d97d70c69
577 577
578 old = *name; 578 old = *name;
579 579
580 name->len = cycle->root.len + old.len; 580 name->len = cycle->root.len + old.len;
581 581
582 if (!(name->data = ngx_palloc(cycle->pool, name->len + 1))) { 582 if (cycle->connections) {
583 return NGX_ERROR; 583 if (!(name->data = ngx_palloc(cycle->pool, name->len + 1))) {
584 return NGX_ERROR;
585 }
586
587 } else {
588
589 /* the init_cycle */
590
591 if (!(name->data = ngx_alloc(name->len + 1, cycle->log))) {
592 return NGX_ERROR;
593 }
584 } 594 }
585 595
586 p = ngx_cpymem(name->data, cycle->root.data, cycle->root.len), 596 p = ngx_cpymem(name->data, cycle->root.data, cycle->root.len),
587 ngx_cpystrn(p, old.data, old.len + 1); 597 ngx_cpystrn(p, old.data, old.len + 1);
588 598