Author: mdounin
Date: 2012-03-05 13:26:40 +0000 (Mon, 05 Mar 2012)
New Revision: 4518

Log:
Merge of r4500: fixed spelling in single-line comments.


Modified:
branches/stable-1.0/
branches/stable-1.0/src/core/ngx_times.c
branches/stable-1.0/src/event/ngx_event.h
branches/stable-1.0/src/event/ngx_event_openssl.c
branches/stable-1.0/src/event/ngx_event_pipe.c
branches/stable-1.0/src/http/modules/ngx_http_autoindex_module.c
branches/stable-1.0/src/http/modules/ngx_http_index_module.c
branches/stable-1.0/src/http/modules/ngx_http_limit_req_module.c
branches/stable-1.0/src/http/modules/ngx_http_limit_zone_module.c
branches/stable-1.0/src/http/modules/ngx_http_log_module.c
branches/stable-1.0/src/http/modules/ngx_http_memcached_module.c
branches/stable-1.0/src/http/modules/ngx_http_proxy_module.c
branches/stable-1.0/src/http/modules/ngx_http_random_index_module.c
branches/stable-1.0/src/http/modules/ngx_http_rewrite_module.c
branches/stable-1.0/src/http/modules/ngx_http_userid_filter_module.c
branches/stable-1.0/src/http/ngx_http_parse_time.c
branches/stable-1.0/src/http/ngx_http_upstream.c
branches/stable-1.0/src/mail/ngx_mail_pop3_handler.c
branches/stable-1.0/src/os/unix/ngx_darwin_sendfile_chain.c
branches/stable-1.0/src/os/unix/ngx_freebsd_sendfile_chain.c
branches/stable-1.0/src/os/unix/ngx_user.c
branches/stable-1.0/src/os/win32/ngx_service.c


Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4309,4313,4315,4320-4321,4326-4327,4335-4336,4338-4343,4372-4375,4377,4379,4381-4385,4393,4396,4398,4400-4406,4413,4415-4416,4422-4423,4460-4461,4468,4470-4471,4473-4474,4491-4493,4497-4499
+ /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4309,4313,4315,4320-4321,4326-4327,4335-4336,4338-4343,4372-4375,4377,4379,4381-4385,4393,4396,4398,4400-4406,4413,4415-4416,4422-4423,4460-4461,4468,4470-4471,4473-4474,4491-4493,4497-4500

Modified: branches/stable-1.0/src/core/ngx_times.c
===================================================================
--- branches/stable-1.0/src/core/ngx_times.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/core/ngx_times.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -287,7 +287,7 @@

days = n / 86400;

- /* Jaunary 1, 1970 was Thursday */
+ /* January 1, 1970 was Thursday */

wday = (4 + days) % 7;


Modified: branches/stable-1.0/src/event/ngx_event.h
===================================================================
--- branches/stable-1.0/src/event/ngx_event.h 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/event/ngx_event.h 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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


Modified: branches/stable-1.0/src/event/ngx_event_openssl.c
===================================================================
--- branches/stable-1.0/src/event/ngx_event_openssl.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/event/ngx_event_openssl.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -842,7 +842,7 @@
case NGX_ERROR:
c->read->error = 1;

- /* fall thruogh */
+ /* fall through */

case NGX_AGAIN:
return c->ssl->last;

Modified: branches/stable-1.0/src/event/ngx_event_pipe.c
===================================================================
--- branches/stable-1.0/src/event/ngx_event_pipe.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/event/ngx_event_pipe.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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;

Modified: branches/stable-1.0/src/http/modules/ngx_http_autoindex_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_autoindex_module.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/http/modules/ngx_http_autoindex_module.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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 */
};



Modified: branches/stable-1.0/src/http/modules/ngx_http_index_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_index_module.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/http/modules/ngx_http_index_module.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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 */
};



Modified: branches/stable-1.0/src/http/modules/ngx_http_limit_req_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_limit_req_module.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/http/modules/ngx_http_limit_req_module.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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 */
};



Modified: branches/stable-1.0/src/http/modules/ngx_http_limit_zone_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_limit_zone_module.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/http/modules/ngx_http_limit_zone_module.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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 */
};



Modified: branches/stable-1.0/src/http/modules/ngx_http_log_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_log_module.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/http/modules/ngx_http_log_module.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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;
}


Modified: branches/stable-1.0/src/http/modules/ngx_http_memcached_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_memcached_module.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/http/modules/ngx_http_memcached_module.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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 */
};



Modified: branches/stable-1.0/src/http/modules/ngx_http_proxy_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_proxy_module.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/http/modules/ngx_http_proxy_module.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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 */
};



Modified: branches/stable-1.0/src/http/modules/ngx_http_random_index_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_random_index_module.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/http/modules/ngx_http_random_index_module.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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 */
};



Modified: branches/stable-1.0/src/http/modules/ngx_http_rewrite_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_rewrite_module.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/http/modules/ngx_http_rewrite_module.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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 */
};



Modified: branches/stable-1.0/src/http/modules/ngx_http_userid_filter_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_userid_filter_module.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/http/modules/ngx_http_userid_filter_module.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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 */
};



Modified: branches/stable-1.0/src/http/ngx_http_parse_time.c
===================================================================
--- branches/stable-1.0/src/http/ngx_http_parse_time.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/http/ngx_http_parse_time.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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 */

Modified: branches/stable-1.0/src/http/ngx_http_upstream.c
===================================================================
--- branches/stable-1.0/src/http/ngx_http_upstream.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/http/ngx_http_upstream.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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;
}


Modified: branches/stable-1.0/src/mail/ngx_mail_pop3_handler.c
===================================================================
--- branches/stable-1.0/src/mail/ngx_mail_pop3_handler.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/mail/ngx_mail_pop3_handler.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -218,7 +218,7 @@

break;

- /* suppress warinings */
+ /* suppress warnings */
case ngx_pop3_passwd:
break;


Modified: branches/stable-1.0/src/os/unix/ngx_darwin_sendfile_chain.c
===================================================================
--- branches/stable-1.0/src/os/unix/ngx_darwin_sendfile_chain.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/os/unix/ngx_darwin_sendfile_chain.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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;

Modified: branches/stable-1.0/src/os/unix/ngx_freebsd_sendfile_chain.c
===================================================================
--- branches/stable-1.0/src/os/unix/ngx_freebsd_sendfile_chain.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/os/unix/ngx_freebsd_sendfile_chain.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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;

Modified: branches/stable-1.0/src/os/unix/ngx_user.c
===================================================================
--- branches/stable-1.0/src/os/unix/ngx_user.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/os/unix/ngx_user.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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;

Modified: branches/stable-1.0/src/os/win32/ngx_service.c
===================================================================
--- branches/stable-1.0/src/os/win32/ngx_service.c 2012-03-05 13:20:40 UTC (rev 4517)
+++ branches/stable-1.0/src/os/win32/ngx_service.c 2012-03-05 13:26:40 UTC (rev 4518)
@@ -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,

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel