Mercurial > hg > nginx
changeset 4517:50143b8fb95f stable-1.0
Merge of r4500: fixed spelling in single-line comments.
line wrap: on
line diff
--- a/src/core/ngx_times.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/core/ngx_times.c Mon Mar 05 13:26:40 2012 +0000 @@ -287,7 +287,7 @@ days = n / 86400; - /* Jaunary 1, 1970 was Thursday */ + /* January 1, 1970 was Thursday */ wday = (4 + days) % 7;
--- a/src/event/ngx_event.h Mon Mar 05 13:20:40 2012 +0000 +++ b/src/event/ngx_event.h Mon Mar 05 13:26:40 2012 +0000 @@ -83,7 +83,7 @@ #endif #if (NGX_WIN32) - /* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was succesfull */ + /* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was successful */ unsigned accept_context_updated:1; #endif
--- a/src/event/ngx_event_openssl.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/event/ngx_event_openssl.c Mon Mar 05 13:26:40 2012 +0000 @@ -842,7 +842,7 @@ case NGX_ERROR: c->read->error = 1; - /* fall thruogh */ + /* fall through */ case NGX_AGAIN: return c->ssl->last;
--- a/src/event/ngx_event_pipe.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/event/ngx_event_pipe.c Mon Mar 05 13:26:40 2012 +0000 @@ -946,7 +946,7 @@ 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;
--- a/src/http/modules/ngx_http_autoindex_module.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/http/modules/ngx_http_autoindex_module.c Mon Mar 05 13:26:40 2012 +0000 @@ -95,8 +95,8 @@ 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 */ };
--- a/src/http/modules/ngx_http_index_module.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/http/modules/ngx_http_index_module.c Mon Mar 05 13:26:40 2012 +0000 @@ -62,8 +62,8 @@ 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 */ };
--- a/src/http/modules/ngx_http_limit_req_module.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/http/modules/ngx_http_limit_req_module.c Mon Mar 05 13:26:40 2012 +0000 @@ -112,8 +112,8 @@ 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 */ };
--- a/src/http/modules/ngx_http_limit_zone_module.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/http/modules/ngx_http_limit_zone_module.c Mon Mar 05 13:26:40 2012 +0000 @@ -96,8 +96,8 @@ 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 */ };
--- a/src/http/modules/ngx_http_log_module.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/http/modules/ngx_http_log_module.c Mon Mar 05 13:26:40 2012 +0000 @@ -161,8 +161,8 @@ 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 @@ 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_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_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 @@ script->values->elts) == NULL) { - /* simulate successfull logging */ + /* simulate successful logging */ return len; } @@ -447,7 +447,7 @@ { 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; }
--- a/src/http/modules/ngx_http_memcached_module.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/http/modules/ngx_http_memcached_module.c Mon Mar 05 13:26:40 2012 +0000 @@ -115,8 +115,8 @@ 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 */ };
--- a/src/http/modules/ngx_http_proxy_module.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/http/modules/ngx_http_proxy_module.c Mon Mar 05 13:26:40 2012 +0000 @@ -458,8 +458,8 @@ 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 */ };
--- a/src/http/modules/ngx_http_random_index_module.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/http/modules/ngx_http_random_index_module.c Mon Mar 05 13:26:40 2012 +0000 @@ -49,8 +49,8 @@ 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 */ };
--- a/src/http/modules/ngx_http_rewrite_module.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/http/modules/ngx_http_rewrite_module.c Mon Mar 05 13:26:40 2012 +0000 @@ -112,8 +112,8 @@ 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 */ };
--- a/src/http/modules/ngx_http_userid_filter_module.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/http/modules/ngx_http_userid_filter_module.c Mon Mar 05 13:26:40 2012 +0000 @@ -166,8 +166,8 @@ 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 */ };
--- a/src/http/ngx_http_parse_time.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/http/ngx_http_parse_time.c Mon Mar 05 13:26:40 2012 +0000 @@ -242,7 +242,7 @@ 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 */
--- a/src/http/ngx_http_upstream.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/http/ngx_http_upstream.c Mon Mar 05 13:26:40 2012 +0000 @@ -2263,7 +2263,7 @@ } 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; }
--- a/src/mail/ngx_mail_pop3_handler.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/mail/ngx_mail_pop3_handler.c Mon Mar 05 13:26:40 2012 +0000 @@ -218,7 +218,7 @@ break; - /* suppress warinings */ + /* suppress warnings */ case ngx_pop3_passwd: break;
--- a/src/os/unix/ngx_darwin_sendfile_chain.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/os/unix/ngx_darwin_sendfile_chain.c Mon Mar 05 13:26:40 2012 +0000 @@ -173,7 +173,7 @@ 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;
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/os/unix/ngx_freebsd_sendfile_chain.c Mon Mar 05 13:26:40 2012 +0000 @@ -178,7 +178,7 @@ if (file) { - /* create the tailer iovec and coalesce the neighbouring bufs */ + /* create the trailer iovec and coalesce the neighbouring bufs */ prev = NULL; iov = NULL;
--- a/src/os/unix/ngx_user.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/os/unix/ngx_user.c Mon Mar 05 13:26:40 2012 +0000 @@ -67,7 +67,7 @@ #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;
--- a/src/os/win32/ngx_service.c Mon Mar 05 13:20:40 2012 +0000 +++ b/src/os/win32/ngx_service.c Mon Mar 05 13:26:40 2012 +0000 @@ -20,7 +20,7 @@ { /* 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,