Merge of r4500: fixed spelling in single-line comments.
This commit is contained in:
parent
8762382663
commit
f0db59f1a7
|
@ -287,7 +287,7 @@ ngx_gmtime(time_t t, ngx_tm_t *tp)
|
|||
|
||||
days = n / 86400;
|
||||
|
||||
/* Jaunary 1, 1970 was Thursday */
|
||||
/* January 1, 1970 was Thursday */
|
||||
|
||||
wday = (4 + days) % 7;
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ struct ngx_event_s {
|
|||
#endif
|
||||
|
||||
#if (NGX_WIN32)
|
||||
/* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was succesfull */
|
||||
/* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was successful */
|
||||
unsigned accept_context_updated:1;
|
||||
#endif
|
||||
|
||||
|
|
|
@ -842,7 +842,7 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
|
|||
case NGX_ERROR:
|
||||
c->read->error = 1;
|
||||
|
||||
/* fall thruogh */
|
||||
/* fall through */
|
||||
|
||||
case NGX_AGAIN:
|
||||
return c->ssl->last;
|
||||
|
|
|
@ -946,7 +946,7 @@ ngx_event_pipe_add_free_buf(ngx_event_pipe_t *p, ngx_buf_t *b)
|
|||
return NGX_OK;
|
||||
}
|
||||
|
||||
/* the first free buf is partialy filled, thus add the free buf after it */
|
||||
/* the first free buf is partially filled, thus add the free buf after it */
|
||||
|
||||
cl->next = p->free_raw_bufs->next;
|
||||
p->free_raw_bufs->next = cl;
|
||||
|
|
|
@ -95,8 +95,8 @@ static ngx_http_module_t ngx_http_autoindex_module_ctx = {
|
|||
NULL, /* create server configuration */
|
||||
NULL, /* merge server configuration */
|
||||
|
||||
ngx_http_autoindex_create_loc_conf, /* create location configration */
|
||||
ngx_http_autoindex_merge_loc_conf /* merge location configration */
|
||||
ngx_http_autoindex_create_loc_conf, /* create location configuration */
|
||||
ngx_http_autoindex_merge_loc_conf /* merge location configuration */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -62,8 +62,8 @@ static ngx_http_module_t ngx_http_index_module_ctx = {
|
|||
NULL, /* create server configuration */
|
||||
NULL, /* merge server configuration */
|
||||
|
||||
ngx_http_index_create_loc_conf, /* create location configration */
|
||||
ngx_http_index_merge_loc_conf /* merge location configration */
|
||||
ngx_http_index_create_loc_conf, /* create location configuration */
|
||||
ngx_http_index_merge_loc_conf /* merge location configuration */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -112,8 +112,8 @@ static ngx_http_module_t ngx_http_limit_req_module_ctx = {
|
|||
NULL, /* create server configuration */
|
||||
NULL, /* merge server configuration */
|
||||
|
||||
ngx_http_limit_req_create_conf, /* create location configration */
|
||||
ngx_http_limit_req_merge_conf /* merge location configration */
|
||||
ngx_http_limit_req_create_conf, /* create location configuration */
|
||||
ngx_http_limit_req_merge_conf /* merge location configuration */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -96,8 +96,8 @@ static ngx_http_module_t ngx_http_limit_zone_module_ctx = {
|
|||
NULL, /* create server configuration */
|
||||
NULL, /* merge server configuration */
|
||||
|
||||
ngx_http_limit_zone_create_conf, /* create location configration */
|
||||
ngx_http_limit_zone_merge_conf /* merge location configration */
|
||||
ngx_http_limit_zone_create_conf, /* create location configuration */
|
||||
ngx_http_limit_zone_merge_conf /* merge location configuration */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -161,8 +161,8 @@ static ngx_http_module_t ngx_http_log_module_ctx = {
|
|||
NULL, /* create server configuration */
|
||||
NULL, /* merge server configuration */
|
||||
|
||||
ngx_http_log_create_loc_conf, /* create location configration */
|
||||
ngx_http_log_merge_loc_conf /* merge location configration */
|
||||
ngx_http_log_create_loc_conf, /* create location configuration */
|
||||
ngx_http_log_merge_loc_conf /* merge location configuration */
|
||||
};
|
||||
|
||||
|
||||
|
@ -375,10 +375,10 @@ ngx_http_log_script_write(ngx_http_request_t *r, ngx_http_log_script_t *script,
|
|||
|
||||
if (!r->root_tested) {
|
||||
|
||||
/* test root directory existance */
|
||||
/* test root directory existence */
|
||||
|
||||
if (ngx_http_map_uri_to_path(r, &path, &root, 0) == NULL) {
|
||||
/* simulate successfull logging */
|
||||
/* simulate successful logging */
|
||||
return len;
|
||||
}
|
||||
|
||||
|
@ -399,14 +399,14 @@ ngx_http_log_script_write(ngx_http_request_t *r, ngx_http_log_script_t *script,
|
|||
!= NGX_OK)
|
||||
{
|
||||
if (of.err == 0) {
|
||||
/* simulate successfull logging */
|
||||
/* simulate successful logging */
|
||||
return len;
|
||||
}
|
||||
|
||||
ngx_log_error(NGX_LOG_ERR, r->connection->log, of.err,
|
||||
"testing \"%s\" existence failed", path.data);
|
||||
|
||||
/* simulate successfull logging */
|
||||
/* simulate successful logging */
|
||||
return len;
|
||||
}
|
||||
|
||||
|
@ -414,7 +414,7 @@ ngx_http_log_script_write(ngx_http_request_t *r, ngx_http_log_script_t *script,
|
|||
ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_ENOTDIR,
|
||||
"testing \"%s\" existence failed", path.data);
|
||||
|
||||
/* simulate successfull logging */
|
||||
/* simulate successful logging */
|
||||
return len;
|
||||
}
|
||||
}
|
||||
|
@ -423,7 +423,7 @@ ngx_http_log_script_write(ngx_http_request_t *r, ngx_http_log_script_t *script,
|
|||
script->values->elts)
|
||||
== NULL)
|
||||
{
|
||||
/* simulate successfull logging */
|
||||
/* simulate successful logging */
|
||||
return len;
|
||||
}
|
||||
|
||||
|
@ -447,7 +447,7 @@ ngx_http_log_script_write(ngx_http_request_t *r, ngx_http_log_script_t *script,
|
|||
{
|
||||
ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
|
||||
"%s \"%s\" failed", of.failed, log.data);
|
||||
/* simulate successfull logging */
|
||||
/* simulate successful logging */
|
||||
return len;
|
||||
}
|
||||
|
||||
|
|
|
@ -115,8 +115,8 @@ static ngx_http_module_t ngx_http_memcached_module_ctx = {
|
|||
NULL, /* create server configuration */
|
||||
NULL, /* merge server configuration */
|
||||
|
||||
ngx_http_memcached_create_loc_conf, /* create location configration */
|
||||
ngx_http_memcached_merge_loc_conf /* merge location configration */
|
||||
ngx_http_memcached_create_loc_conf, /* create location configuration */
|
||||
ngx_http_memcached_merge_loc_conf /* merge location configuration */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -458,8 +458,8 @@ static ngx_http_module_t ngx_http_proxy_module_ctx = {
|
|||
NULL, /* create server configuration */
|
||||
NULL, /* merge server configuration */
|
||||
|
||||
ngx_http_proxy_create_loc_conf, /* create location configration */
|
||||
ngx_http_proxy_merge_loc_conf /* merge location configration */
|
||||
ngx_http_proxy_create_loc_conf, /* create location configuration */
|
||||
ngx_http_proxy_merge_loc_conf /* merge location configuration */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -49,8 +49,8 @@ static ngx_http_module_t ngx_http_random_index_module_ctx = {
|
|||
NULL, /* create server configuration */
|
||||
NULL, /* merge server configuration */
|
||||
|
||||
ngx_http_random_index_create_loc_conf, /* create location configration */
|
||||
ngx_http_random_index_merge_loc_conf /* merge location configration */
|
||||
ngx_http_random_index_create_loc_conf, /* create location configuration */
|
||||
ngx_http_random_index_merge_loc_conf /* merge location configuration */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -112,8 +112,8 @@ static ngx_http_module_t ngx_http_rewrite_module_ctx = {
|
|||
NULL, /* create server configuration */
|
||||
NULL, /* merge server configuration */
|
||||
|
||||
ngx_http_rewrite_create_loc_conf, /* create location configration */
|
||||
ngx_http_rewrite_merge_loc_conf /* merge location configration */
|
||||
ngx_http_rewrite_create_loc_conf, /* create location configuration */
|
||||
ngx_http_rewrite_merge_loc_conf /* merge location configuration */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -166,8 +166,8 @@ static ngx_http_module_t ngx_http_userid_filter_module_ctx = {
|
|||
NULL, /* create server configuration */
|
||||
NULL, /* merge server configuration */
|
||||
|
||||
ngx_http_userid_create_conf, /* create location configration */
|
||||
ngx_http_userid_merge_conf /* merge location configration */
|
||||
ngx_http_userid_create_conf, /* create location configuration */
|
||||
ngx_http_userid_merge_conf /* merge location configuration */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -242,7 +242,7 @@ ngx_http_parse_time(u_char *value, size_t len)
|
|||
year -= 1;
|
||||
}
|
||||
|
||||
/* Gauss' formula for Grigorian days since March 1, 1 BC */
|
||||
/* Gauss' formula for Gregorian days since March 1, 1 BC */
|
||||
|
||||
time = (uint64_t) (
|
||||
/* days in years including leap years since March 1, 1 BC */
|
||||
|
|
|
@ -2263,7 +2263,7 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
|
|||
}
|
||||
|
||||
if (ngx_event_flags & NGX_USE_AIO_EVENT) {
|
||||
/* the posted aio operation may currupt a shadow buffer */
|
||||
/* the posted aio operation may corrupt a shadow buffer */
|
||||
p->single_buf = 1;
|
||||
}
|
||||
|
||||
|
|
|
@ -218,7 +218,7 @@ ngx_mail_pop3_auth_state(ngx_event_t *rev)
|
|||
|
||||
break;
|
||||
|
||||
/* suppress warinings */
|
||||
/* suppress warnings */
|
||||
case ngx_pop3_passwd:
|
||||
break;
|
||||
|
||||
|
|
|
@ -173,7 +173,7 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
|
|||
|
||||
if (file && header.nelts == 0) {
|
||||
|
||||
/* create the tailer iovec and coalesce the neighbouring bufs */
|
||||
/* create the trailer iovec and coalesce the neighbouring bufs */
|
||||
|
||||
prev = NULL;
|
||||
iov = NULL;
|
||||
|
|
|
@ -178,7 +178,7 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
|
|||
|
||||
if (file) {
|
||||
|
||||
/* create the tailer iovec and coalesce the neighbouring bufs */
|
||||
/* create the trailer iovec and coalesce the neighbouring bufs */
|
||||
|
||||
prev = NULL;
|
||||
iov = NULL;
|
||||
|
|
|
@ -67,7 +67,7 @@ ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
|
|||
|
||||
#if (NGX_THREADS && NGX_NONREENTRANT_CRYPT)
|
||||
|
||||
/* crypt() is a time consuming funtion, so we only try to lock */
|
||||
/* crypt() is a time consuming function, so we only try to lock */
|
||||
|
||||
if (ngx_mutex_trylock(ngx_crypt_mutex) != NGX_OK) {
|
||||
return NGX_AGAIN;
|
||||
|
|
|
@ -20,7 +20,7 @@ ngx_int_t ngx_service(ngx_log_t *log)
|
|||
{
|
||||
/* primary thread */
|
||||
|
||||
/* StartServiceCtrlDispatcher() shouxpdl be called within 30 seconds */
|
||||
/* StartServiceCtrlDispatcher() should be called within 30 seconds */
|
||||
|
||||
if (StartServiceCtrlDispatcher(st) == 0) {
|
||||
ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
|
||||
|
|
Loading…
Reference in New Issue