diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-03-05 13:26:40 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-03-05 13:26:40 +0000 |
| commit | fc03bdde05ef82c3e215a0a0d41a1e88419996df (patch) | |
| tree | c71ad4e462bd1d712d88644cbe4442c03de2d068 /src/os | |
| parent | 1b6a7864a1777b070851fead7626fb21862932b3 (diff) | |
| download | nginx-fc03bdde05ef82c3e215a0a0d41a1e88419996df.tar.gz nginx-fc03bdde05ef82c3e215a0a0d41a1e88419996df.tar.bz2 | |
Merge of r4500: fixed spelling in single-line comments.
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/unix/ngx_darwin_sendfile_chain.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_freebsd_sendfile_chain.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_user.c | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_service.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/os/unix/ngx_darwin_sendfile_chain.c b/src/os/unix/ngx_darwin_sendfile_chain.c index c86976549..ec247d21b 100644 --- a/src/os/unix/ngx_darwin_sendfile_chain.c +++ b/src/os/unix/ngx_darwin_sendfile_chain.c @@ -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; diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c index 610697d77..26b326705 100644 --- a/src/os/unix/ngx_freebsd_sendfile_chain.c +++ b/src/os/unix/ngx_freebsd_sendfile_chain.c @@ -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; diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c index cb452e62b..27f990e83 100644 --- a/src/os/unix/ngx_user.c +++ b/src/os/unix/ngx_user.c @@ -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; diff --git a/src/os/win32/ngx_service.c b/src/os/win32/ngx_service.c index d8b41a9b2..5bed9a7d8 100644 --- a/src/os/win32/ngx_service.c +++ b/src/os/win32/ngx_service.c @@ -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, |