]> git.kaiwu.me - nginx.git/commitdiff
Fixed spelling.
authorJosh Soref <timeless@gmail.com>
Thu, 7 Apr 2016 08:50:13 +0000 (11:50 +0300)
committerJosh Soref <timeless@gmail.com>
Thu, 7 Apr 2016 08:50:13 +0000 (11:50 +0300)
auto/cc/icc
contrib/vim/syntax/nginx.vim
src/event/ngx_event_acceptex.c
src/http/modules/ngx_http_mp4_module.c
src/http/modules/ngx_http_ssi_filter_module.c
src/os/win32/ngx_win32_init.c

index 1d83ed37a03e505e8e633ee3792d83a6d8f75280..1c0df1a9919c558adabd75bfa890b401c163e41e 100644 (file)
@@ -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()
index 8f130179fb66b5266900caf1c4c4211b9c48e5a9..f1fd48a0eca68b253e099dbd88fb188abb043d49 100644 (file)
@@ -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
 
index ac511ef77664942d79c5e2f11d8b179261e0b222..1dbfd6ce92a45c3105e9112404975c2ba9520de4 100644 (file)
@@ -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;
index 6cb3ccfaa5b39340cca7782c86056f10d4a2f9c9..16ef83cf0c637210ac343c92dfa686047d14cf7e 100644 (file)
@@ -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;
 
 
index b997aaa540ab2fccd7544ac8bc0f3e558c15c09f..b0e4c8c9257a36ee30a60dcfc55d0204a852a7c6 100644 (file)
@@ -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;
     }
index 9e77a789d346eedf09abda9b1011716a315619eb..9b26db5898809bc8c57cf72b5966e10648bb14aa 100644 (file)
@@ -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;
     }