diff options
author | Josh Soref <timeless@gmail.com> | 2016-04-07 11:50:13 +0300 |
---|---|---|
committer | Josh Soref <timeless@gmail.com> | 2016-04-07 11:50:13 +0300 |
commit | 73d27510c0d7022384a611269af22ff01634c6d0 (patch) | |
tree | eb0ab93595aeabe0e6033127a3e1a8764f31e706 | |
parent | 2f9f3453f2580337234de1c4ac14ae1c583201eb (diff) | |
download | nginx-73d27510c0d7022384a611269af22ff01634c6d0.tar.gz |
Fixed spelling.
-rw-r--r-- | auto/cc/icc | 4 | ||||
-rw-r--r-- | contrib/vim/syntax/nginx.vim | 2 | ||||
-rw-r--r-- | src/event/ngx_event_acceptex.c | 2 | ||||
-rw-r--r-- | src/http/modules/ngx_http_mp4_module.c | 8 | ||||
-rw-r--r-- | src/http/modules/ngx_http_ssi_filter_module.c | 2 | ||||
-rw-r--r-- | src/os/win32/ngx_win32_init.c | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/auto/cc/icc b/auto/cc/icc index 1d83ed37a..1c0df1a99 100644 --- a/auto/cc/icc +++ b/auto/cc/icc @@ -89,7 +89,7 @@ CFLAGS="$CFLAGS -wd1419" case "$NGX_ICC_VER" in 9.*) - # "cc" clobber ignored, warnings for Liunx's htonl()/htons() + # "cc" clobber ignored, warnings for Linux's htonl()/htons() CFLAGS="$CFLAGS -wd1469" # explicit conversion of a 64-bit integral type to a smaller # integral type @@ -103,7 +103,7 @@ case "$NGX_ICC_VER" in ;; 8.*) - # "cc" clobber ignored, warnings for Liunx's htonl()/htons() + # "cc" clobber ignored, warnings for Linux's htonl()/htons() CFLAGS="$CFLAGS -wd1469" # floating-point equality and inequality comparisons are unreliable, # warning on SvTRUE() diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim index 8f130179f..f1fd48a0e 100644 --- a/contrib/vim/syntax/nginx.vim +++ b/contrib/vim/syntax/nginx.vim @@ -604,7 +604,7 @@ syn keyword ngxDirectiveThirdParty echo_subrequest syn keyword ngxDirectiveThirdParty echo_subrequest_async " Events Module <http://docs.dutov.org/nginx_modules_events_en.html> -" Privides options for start/stop events. +" Provides options for start/stop events. syn keyword ngxDirectiveThirdParty on_start syn keyword ngxDirectiveThirdParty on_stop diff --git a/src/event/ngx_event_acceptex.c b/src/event/ngx_event_acceptex.c index ac511ef77..1dbfd6ce9 100644 --- a/src/event/ngx_event_acceptex.c +++ b/src/event/ngx_event_acceptex.c @@ -189,7 +189,7 @@ ngx_event_post_acceptex(ngx_listening_t *ls, ngx_uint_t n) err = ngx_socket_errno; if (err != WSA_IO_PENDING) { ngx_log_error(NGX_LOG_ALERT, &ls->log, err, - "AcceptEx() %V falied", &ls->addr_text); + "AcceptEx() %V failed", &ls->addr_text); ngx_close_posted_connection(c); return NGX_ERROR; diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c index 6cb3ccfaa..16ef83cf0 100644 --- a/src/http/modules/ngx_http_mp4_module.c +++ b/src/http/modules/ngx_http_mp4_module.c @@ -1433,10 +1433,10 @@ typedef struct { u_char layer[2]; u_char group[2]; u_char volume[2]; - u_char reverved3[2]; + u_char reserved3[2]; u_char matrix[36]; u_char width[4]; - u_char heigth[4]; + u_char height[4]; } ngx_mp4_tkhd_atom_t; typedef struct { @@ -1453,10 +1453,10 @@ typedef struct { u_char layer[2]; u_char group[2]; u_char volume[2]; - u_char reverved3[2]; + u_char reserved3[2]; u_char matrix[36]; u_char width[4]; - u_char heigth[4]; + u_char height[4]; } ngx_mp4_tkhd64_atom_t; diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c index b997aaa54..b0e4c8c92 100644 --- a/src/http/modules/ngx_http_ssi_filter_module.c +++ b/src/http/modules/ngx_http_ssi_filter_module.c @@ -2005,7 +2005,7 @@ ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, if (uri && file) { ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, - "inlcusion may be either virtual=\"%V\" or file=\"%V\"", + "inclusion may be either virtual=\"%V\" or file=\"%V\"", uri, file); return NGX_HTTP_SSI_ERROR; } diff --git a/src/os/win32/ngx_win32_init.c b/src/os/win32/ngx_win32_init.c index 9e77a789d..9b26db589 100644 --- a/src/os/win32/ngx_win32_init.c +++ b/src/os/win32/ngx_win32_init.c @@ -152,7 +152,7 @@ ngx_os_init(ngx_log_t *log) s = ngx_socket(AF_INET, SOCK_STREAM, IPPROTO_IP); if (s == (ngx_socket_t) -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, - ngx_socket_n " falied"); + ngx_socket_n " failed"); return NGX_ERROR; } |