mirror of
https://github.com/nginx/nginx.git
synced 2025-01-19 01:42:58 +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);
|
||||
if (ngx_temp_pool == NULL) {
|
||||
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
|
||||
"can not create ngx_temp_pool");
|
||||
"could not create ngx_temp_pool");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
@ -68,7 +68,7 @@ ngx_destroy_pool(ngx_pool_t *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) {
|
||||
|
@ -381,7 +381,7 @@ ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args)
|
||||
|
||||
/*
|
||||
* (int64_t) cast is required for msvc6:
|
||||
* it can not convert uint64_t to double
|
||||
* it cannot convert uint64_t to double
|
||||
*/
|
||||
ui64 = (uint64_t) ((f - (int64_t) ui64) * scale + 0.5);
|
||||
|
||||
|
@ -1027,7 +1027,7 @@ ngx_event_use(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||
"when the server runs without a master process "
|
||||
"the \"%V\" event type must be the same as "
|
||||
"in previous configuration - \"%s\" "
|
||||
"and it can not be changed on the fly, "
|
||||
"and it cannot be changed on the fly, "
|
||||
"to change it you need to stop server "
|
||||
"and start it again",
|
||||
&value[1], old_ecf->name);
|
||||
|
@ -103,11 +103,11 @@ ngx_event_expire_timers(void)
|
||||
if (ngx_threaded && ngx_trylock(ev->lock) == 0) {
|
||||
|
||||
/*
|
||||
* We can not change the timer of the event that is been
|
||||
* handling by another thread. And we can not easy walk
|
||||
* the rbtree to find a next expired timer so we exit the loop.
|
||||
* However it should be rare case when the event that is
|
||||
* been handling has expired timer.
|
||||
* We cannot change the timer of the event that is being
|
||||
* handled by another thread. And we cannot easy walk
|
||||
* the rbtree to find next expired timer so we exit the loop.
|
||||
* However, it should be a rare case when the event that is
|
||||
* being handled has an expired timer.
|
||||
*/
|
||||
|
||||
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
|
||||
|
@ -158,7 +158,7 @@ ngx_http_dav_handler(ngx_http_request_t *r)
|
||||
|
||||
if (r->uri.data[r->uri.len - 1] == '/') {
|
||||
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
|
||||
"can not PUT to a collection");
|
||||
"cannot PUT to a collection");
|
||||
return NGX_HTTP_CONFLICT;
|
||||
}
|
||||
|
||||
|
@ -507,7 +507,7 @@ ngx_http_headers_expires(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||
minus = 0;
|
||||
|
||||
if (hcf->expires == NGX_HTTP_EXPIRES_MODIFIED) {
|
||||
return "daily time can not be used with \"modified\" parameter";
|
||||
return "daily time cannot be used with \"modified\" parameter";
|
||||
}
|
||||
|
||||
hcf->expires = NGX_HTTP_EXPIRES_DAILY;
|
||||
|
@ -960,7 +960,7 @@ buffer:
|
||||
|
||||
if (log->script) {
|
||||
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
||||
"buffered logs can not have variables in name");
|
||||
"buffered logs cannot have variables in name");
|
||||
return NGX_CONF_ERROR;
|
||||
}
|
||||
|
||||
|
@ -1226,7 +1226,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
|
||||
#endif
|
||||
|
||||
/*
|
||||
* we can not compare whole sockaddr struct's as kernel
|
||||
* we cannot compare whole sockaddr struct's as kernel
|
||||
* may fill some fields in inherited sockaddr struct's
|
||||
*/
|
||||
|
||||
|
@ -3191,7 +3191,7 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
|
||||
prev->underscores_in_headers, 0);
|
||||
|
||||
if (conf->server_names.nelts == 0) {
|
||||
/* the array has 4 empty preallocated elements, so push can not fail */
|
||||
/* the array has 4 empty preallocated elements, so push cannot fail */
|
||||
sn = ngx_array_push(&conf->server_names);
|
||||
#if (NGX_PCRE)
|
||||
sn->regex = NULL;
|
||||
|
@ -12,7 +12,7 @@
|
||||
* The strerror() messages are copied because:
|
||||
*
|
||||
* 1) strerror() and strerror_r() functions are not Async-Signal-Safe,
|
||||
* therefore, they can not be used in signal handlers;
|
||||
* therefore, they cannot be used in signal handlers;
|
||||
*
|
||||
* 2) a direct sys_errlist[] array may be used instead of these functions,
|
||||
* but Linux linker warns about its usage:
|
||||
|
@ -23,7 +23,7 @@
|
||||
* kqueue EVFILT_AIO filter is level triggered only: an event repeats
|
||||
* until aio_return() will be called;
|
||||
*
|
||||
* aio_cancel() can not cancel file AIO: it returns AIO_NOTCANCELED always.
|
||||
* aio_cancel() cannot cancel file AIO: it returns AIO_NOTCANCELED always.
|
||||
*/
|
||||
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
/*
|
||||
* Although FreeBSD sendfile() allows to pass a header and a trailer,
|
||||
* it can not send a header with a part of the file in one packet until
|
||||
* it cannot send a header with a part of the file in one packet until
|
||||
* FreeBSD 5.3. Besides, over the fast ethernet connection sendfile()
|
||||
* may send the partially filled packets, i.e. the 8 file pages may be sent
|
||||
* as the 11 full 1460-bytes packets, then one incomplete 324-bytes packet,
|
||||
|
@ -541,7 +541,7 @@ ngx_process_get_status(void)
|
||||
if (WEXITSTATUS(status) == 2 && ngx_processes[i].respawn) {
|
||||
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
|
||||
"%s %P exited with fatal code %d "
|
||||
"and can not be respawn",
|
||||
"and cannot be respawned",
|
||||
process, pid, WEXITSTATUS(status));
|
||||
ngx_processes[i].respawn = 0;
|
||||
}
|
||||
|
@ -620,7 +620,8 @@ ngx_reap_children(ngx_cycle_t *cycle)
|
||||
== NGX_INVALID_PID)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -530,7 +530,7 @@ ngx_reap_worker(ngx_cycle_t *cycle, HANDLE h)
|
||||
== NGX_INVALID_PID)
|
||||
{
|
||||
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) {
|
||||
ngx_last_process--;
|
||||
|
Loading…
Reference in New Issue
Block a user