Mercurial > hg > nginx

comparison src/os/unix/ngx_process_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 6843e7c492b7
children c8b9f62cb414
comparison
equal deleted inserted replaced
4245:8d39230df833 4246:d3568507db51
618 ngx_processes[i].data, 618 ngx_processes[i].data,
619 ngx_processes[i].name, i) 619 ngx_processes[i].name, i)
620 == NGX_INVALID_PID) 620 == NGX_INVALID_PID)
621 { 621 {
622 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, 622 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
623 "can not respawn %s", ngx_processes[i].name); 623 "could not respawn %s",
624 ngx_processes[i].name);
624 continue; 625 continue;
625 } 626 }
626 627
627 628
628 ch.command = NGX_CMD_OPEN_CHANNEL; 629 ch.command = NGX_CMD_OPEN_CHANNEL;