r1587, r1588, r1589, r1590, r1592, r1599, r1629, r1636, r1674, r1681,

r1682, r1683 merge:

typo and style fixes

diff --git a/src/core/ngx_md5.h b/src/core/ngx_md5.h
index eeba97e863c1c230bd28e4aa1881020bbf47c5e8..f2e99bc987dd2a9415615cfa921131c2376c6d49 100644 (file)
--- a/src/core/ngx_md5.h
+++ b/src/core/ngx_md5.h
@@ -24,15 +24,15 @@ typedef MD5_CTX  ngx_md5_t;
 
 #if (NGX_OPENSSL_MD5)
 
-#define  ngx_md5_init    MD5_Init
-#define  ngx_md5_update  MD5_Update
-#define  ngx_md5_final   MD5_Final
+#define ngx_md5_init    MD5_Init
+#define ngx_md5_update  MD5_Update
+#define ngx_md5_final   MD5_Final
 
 #else
 
-#define  ngx_md5_init    MD5Init
-#define  ngx_md5_update  MD5Update
-#define  ngx_md5_final   MD5Final
+#define ngx_md5_init    MD5Init
+#define ngx_md5_update  MD5Update
+#define ngx_md5_final   MD5Final
 
 #endif
 

diff --git a/src/core/ngx_sha1.h b/src/core/ngx_sha1.h
index 78f52c5cece296c7e4739dbd5dfcc46c2169a9cb..f158fd4dc92ca53e66e4195d54c50259428687a0 100644 (file)
--- a/src/core/ngx_sha1.h
+++ b/src/core/ngx_sha1.h
@@ -22,9 +22,9 @@
 typedef SHA_CTX  ngx_sha1_t;
 
 
-#define  ngx_sha1_init    SHA1_Init
-#define  ngx_sha1_update  SHA1_Update
-#define  ngx_sha1_final   SHA1_Final
+#define ngx_sha1_init    SHA1_Init
+#define ngx_sha1_update  SHA1_Update
+#define ngx_sha1_final   SHA1_Final
 
 
 #endif /* _NGX_SHA1_H_INCLUDED_ */

diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c
index 98919ae2f3df01726c23c56ac66abce7fc4a52a3..8c9fad6f93ce44c9fc85133b21b5527a9e270d58 100644 (file)
--- a/src/http/modules/ngx_http_charset_filter_module.c
+++ b/src/http/modules/ngx_http_charset_filter_module.c
@@ -366,8 +366,8 @@ ngx_http_charset_header_filter(ngx_http_request_t *r)
 no_charset_map:
 
     ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                  "no \"charset_map\" between the charsets "
-                  "\"%V\" and \"%V\"", from, to);
+                  "no \"charset_map\" between the charsets \"%V\" and \"%V\"",
+                  from, to);
 
     return ngx_http_next_header_filter(r);
 }
@@ -1519,9 +1519,8 @@ ngx_http_charset_postconfiguration(ngx_conf_t *cf)
         }
 
         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      " no \"charset_map\" between the charsets "
-                      "\"%V\" and \"%V\"",
-                      &charset[c].name, &charset[recode[i].dst].name);
+                   "no \"charset_map\" between the charsets \"%V\" and \"%V\"",
+                   &charset[c].name, &charset[recode[i].dst].name);
         return NGX_ERROR;
 
     next:

diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 36cecdb7ba6200635d582401f585de30d9fc86ce..fb2578bf34a15c500747d69d50760f2ac4936db8 100644 (file)
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -432,7 +432,7 @@ ngx_http_fastcgi_handler(ngx_http_request_t *r)
     if (r->subrequest_in_memory) {
         ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
                       "ngx_http_fastcgi_module does not support "
-                      "subrequest in memeory");
+                      "subrequest in memory");
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index dfa5fa5876ac440f09c2ea9f04930f1faeebd08e..b61e2a6b1bba150f26362cdf9a33a25b67f8c51d 100644 (file)
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -669,7 +669,7 @@ ngx_http_core_find_config_phase(ngx_http_request_t *r,
         && clcf->client_max_body_size < r->headers_in.content_length_n)
     {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "client intented to send too large body: %O bytes",
+                      "client intended to send too large body: %O bytes",
                       r->headers_in.content_length_n);
 
         ngx_http_finalize_request(r, NGX_HTTP_REQUEST_ENTITY_TOO_LARGE);
@@ -1585,7 +1585,7 @@ ngx_http_named_location(ngx_http_request_t *r, ngx_str_t *name)
     }
 
     ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                  "could not find name location \"%V\"", name);
+                  "could not find named location \"%V\"", name);
 
     ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
     return NGX_DONE;

diff --git a/src/http/ngx_http_parse_time.c b/src/http/ngx_http_parse_time.c
index 29611f4868a87e4de86a2b7fe0f7948a98b8edc1..115508954505e938640fa6a82b0ca3e47cd3fffd 100644 (file)
--- a/src/http/ngx_http_parse_time.c
+++ b/src/http/ngx_http_parse_time.c
@@ -11,7 +11,8 @@
 
 static int mday[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
 
-time_t ngx_http_parse_time(u_char *value, size_t len)
+time_t
+ngx_http_parse_time(u_char *value, size_t len)
 {
     u_char  *p, *end;
     int      day, month, year, hour, min, sec;
@@ -247,7 +248,7 @@ time_t ngx_http_parse_time(u_char *value, size_t len)
         year -= 1;
     }
 
-    /* Gauss's formula for Grigorian days from 1 March 1 BC */
+    /* Gauss's formula for Grigorian days from March 1, 1 BC */
 
     return (365 * year + year / 4 - year / 100 + year / 400
             + 367 * month / 12 - 31

diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index 1a401bc970c395836e3c36e68c048a7d425d8a60..a6b78a5aa52eaf10388d3a2e5838a19728d42037 100644 (file)
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -102,7 +102,7 @@ typedef enum {
     ngx_pop3_auth_login_password,
     ngx_pop3_auth_plain,
     ngx_pop3_auth_cram_md5
-} ngx_po3_state_e;
+} ngx_pop3_state_e;
 
 
 typedef enum {

diff --git a/src/os/unix/ngx_recv.c b/src/os/unix/ngx_recv.c
index db9a834504faa18c1ddadcde67c5520754b85a38..6361b3ce02007fe9e1d9aefeee1e91011b56a7aa 100644 (file)
--- a/src/os/unix/ngx_recv.c
+++ b/src/os/unix/ngx_recv.c
@@ -11,7 +11,8 @@
 
 #if (NGX_HAVE_KQUEUE)
 
-ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
+ssize_t
+ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
 {
     ssize_t       n;
     ngx_err_t     err;
@@ -77,12 +78,6 @@ ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
                      * even if kqueue reported about available data
                      */
 
-#if 0
-                    ngx_log_error(NGX_LOG_ALERT, c->log, 0,
-                                  "recv() returned 0 while kevent() reported "
-                                  "%d available bytes", rev->available);
-#endif
-
                     rev->eof = 1;
                     rev->available = 0;
                 }
@@ -126,7 +121,8 @@ ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
 
 #else /* ! NGX_HAVE_KQUEUE */
 
-ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
+ssize_t
+ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
 {
     ssize_t       n;
     ngx_err_t     err;

diff --git a/src/os/unix/ngx_send.c b/src/os/unix/ngx_send.c
index 167f2eca33ff353acf3a2f6294785df7ab7c8846..5cbb1285e06be477e005d924c5a60f1718fbf553 100644 (file)
--- a/src/os/unix/ngx_send.c
+++ b/src/os/unix/ngx_send.c
@@ -9,7 +9,8 @@
 #include <ngx_event.h>
 
 
-ssize_t ngx_unix_send(ngx_connection_t *c, u_char *buf, size_t size)
+ssize_t
+ngx_unix_send(ngx_connection_t *c, u_char *buf, size_t size)
 {
     ssize_t       n;
     ngx_err_t     err;

diff --git a/src/os/win32/ngx_wsarecv.c b/src/os/win32/ngx_wsarecv.c
index ac7a5c4c97ecd48306ca057cffb3c687d401db35..908d1f38b86afd303668032034826f19a7ff8e6b 100644 (file)
--- a/src/os/win32/ngx_wsarecv.c
+++ b/src/os/win32/ngx_wsarecv.c
@@ -9,7 +9,8 @@
 #include <ngx_event.h>
 
 
-ssize_t ngx_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
+ssize_t
+ngx_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
 {
     int           rc;
     u_long        bytes, flags;
@@ -57,7 +58,8 @@ ssize_t ngx_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
 }
 
 
-ssize_t ngx_overlapped_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
+ssize_t
+ngx_overlapped_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
 {
     int               rc;
     u_long            bytes, flags;