mirror of
https://github.com/nginx/nginx.git
synced 2025-06-07 17:52:38 +08:00
Replaced "can not" with "cannot" and "could not" in a bunch of places.
Fixed nearby grammar errors.
This commit is contained in:
parent
3b7ed02583
commit
a823c550e4
@ -739,7 +739,7 @@ old_shm_zone_done:
|
|||||||
ngx_temp_pool = ngx_create_pool(128, cycle->log);
|
ngx_temp_pool = ngx_create_pool(128, cycle->log);
|
||||||
if (ngx_temp_pool == NULL) {
|
if (ngx_temp_pool == NULL) {
|
||||||
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
|
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
|
||||||
"can not create ngx_temp_pool");
|
"could not create ngx_temp_pool");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ ngx_destroy_pool(ngx_pool_t *pool)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* we could allocate the pool->log from this pool
|
* we could allocate the pool->log from this pool
|
||||||
* so we can not use this log while the free()ing the pool
|
* so we cannot use this log while free()ing the pool
|
||||||
*/
|
*/
|
||||||
|
|
||||||
for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
|
for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
|
||||||
|
@ -103,11 +103,11 @@ ngx_event_expire_timers(void)
|
|||||||
if (ngx_threaded && ngx_trylock(ev->lock) == 0) {
|
if (ngx_threaded && ngx_trylock(ev->lock) == 0) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We can not change the timer of the event that is been
|
* We cannot change the timer of the event that is being
|
||||||
* handling by another thread. And we can not easy walk
|
* handled by another thread. And we cannot easy walk
|
||||||
* the rbtree to find a next expired timer so we exit the loop.
|
* the rbtree to find next expired timer so we exit the loop.
|
||||||
* However it should be rare case when the event that is
|
* However, it should be a rare case when the event that is
|
||||||
* been handling has expired timer.
|
* being handled has an expired timer.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
|
||||||
|
@ -541,7 +541,7 @@ ngx_process_get_status(void)
|
|||||||
if (WEXITSTATUS(status) == 2 && ngx_processes[i].respawn) {
|
if (WEXITSTATUS(status) == 2 && ngx_processes[i].respawn) {
|
||||||
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
|
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
|
||||||
"%s %P exited with fatal code %d "
|
"%s %P exited with fatal code %d "
|
||||||
"and can not be respawn",
|
"and cannot be respawned",
|
||||||
process, pid, WEXITSTATUS(status));
|
process, pid, WEXITSTATUS(status));
|
||||||
ngx_processes[i].respawn = 0;
|
ngx_processes[i].respawn = 0;
|
||||||
}
|
}
|
||||||
|
@ -620,7 +620,8 @@ ngx_reap_children(ngx_cycle_t *cycle)
|
|||||||
== NGX_INVALID_PID)
|
== NGX_INVALID_PID)
|
||||||
{
|
{
|
||||||
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
|
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
|
||||||
"can not respawn %s", ngx_processes[i].name);
|
"could not respawn %s",
|
||||||
|
ngx_processes[i].name);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -530,7 +530,7 @@ ngx_reap_worker(ngx_cycle_t *cycle, HANDLE h)
|
|||||||
== NGX_INVALID_PID)
|
== NGX_INVALID_PID)
|
||||||
{
|
{
|
||||||
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
|
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
|
||||||
"can not respawn %s", ngx_processes[n].name);
|
"could not respawn %s", ngx_processes[n].name);
|
||||||
|
|
||||||
if (n == ngx_last_process - 1) {
|
if (n == ngx_last_process - 1) {
|
||||||
ngx_last_process--;
|
ngx_last_process--;
|
||||||
|
Loading…
Reference in New Issue
Block a user