Mercurial > hg > nginx

changeset 6504:293413010217

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed spelling.
author Josh Soref <timeless@gmail.com>
date Thu, 07 Apr 2016 11:50:13 +0300
parents abc3be8d92ef
children 5ad379eab6fa
files 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
diffstat 6 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/auto/cc/icc	Thu Apr 07 19:09:42 2016 +0300
+++ b/auto/cc/icc	Thu Apr 07 11:50:13 2016 +0300
@@ -89,7 +89,7 @@
 
 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 @@
     ;;
 
     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()
--- a/contrib/vim/syntax/nginx.vim	Thu Apr 07 19:09:42 2016 +0300
+++ b/contrib/vim/syntax/nginx.vim	Thu Apr 07 11:50:13 2016 +0300
@@ -604,7 +604,7 @@
 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
 
--- a/src/event/ngx_event_acceptex.c	Thu Apr 07 19:09:42 2016 +0300
+++ b/src/event/ngx_event_acceptex.c	Thu Apr 07 11:50:13 2016 +0300
@@ -189,7 +189,7 @@
             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;
--- a/src/http/modules/ngx_http_mp4_module.c	Thu Apr 07 19:09:42 2016 +0300
+++ b/src/http/modules/ngx_http_mp4_module.c	Thu Apr 07 11:50:13 2016 +0300
@@ -1433,10 +1433,10 @@
     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 @@
     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;
 
 
--- a/src/http/modules/ngx_http_ssi_filter_module.c	Thu Apr 07 19:09:42 2016 +0300
+++ b/src/http/modules/ngx_http_ssi_filter_module.c	Thu Apr 07 11:50:13 2016 +0300
@@ -2005,7 +2005,7 @@
 
     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;
     }
--- a/src/os/win32/ngx_win32_init.c	Thu Apr 07 19:09:42 2016 +0300
+++ b/src/os/win32/ngx_win32_init.c	Thu Apr 07 11:50:13 2016 +0300
@@ -152,7 +152,7 @@
     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;
     }