Mercurial > hg > nginx

comparison src/core/ngx_cycle.c @ 4246:d3568507db51 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging r4132, r4134, r4143, r4183, r4191, r4199: Various fixes related to error messages: *) Removed old warning that suggested to use "server_name_in_redirect off" (now the default) in place of no longer supported "server_name *". *) Fixing directive name in error message if types hash size is not enough. *) Replaced "can not" with "cannot" and "could not" in a bunch of places. Fixed nearby grammar errors. *) Overhauled error messages.
author Igor Sysoev <igor@sysoev.ru>
date Tue, 01 Nov 2011 13:24:50 +0000
parents 718f2154b813
children 3f6040cd731e 4919fb357a5d
comparison
equal deleted inserted replaced
4245:8d39230df833 4246:d3568507db51
737 737
738 if (ngx_temp_pool == NULL) { 738 if (ngx_temp_pool == NULL) {
739 ngx_temp_pool = ngx_create_pool(128, cycle->log); 739 ngx_temp_pool = ngx_create_pool(128, cycle->log);
740 if (ngx_temp_pool == NULL) { 740 if (ngx_temp_pool == NULL) {
741 ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, 741 ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
742 "can not create ngx_temp_pool"); 742 "could not create ngx_temp_pool");
743 exit(1); 743 exit(1);
744 } 744 }
745 745
746 n = 10; 746 n = 10;
747 ngx_old_cycles.elts = ngx_pcalloc(ngx_temp_pool, 747 ngx_old_cycles.elts = ngx_pcalloc(ngx_temp_pool,