summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/ngx_md5.h12
-rw-r--r--src/core/ngx_sha1.h6
-rw-r--r--src/http/modules/ngx_http_charset_filter_module.c9
-rw-r--r--src/http/modules/ngx_http_fastcgi_module.c2
-rw-r--r--src/http/ngx_http_core_module.c4
-rw-r--r--src/http/ngx_http_parse_time.c5
-rw-r--r--src/mail/ngx_mail.h2
-rw-r--r--src/os/unix/ngx_recv.c12
-rw-r--r--src/os/unix/ngx_send.c3
-rw-r--r--src/os/win32/ngx_wsarecv.c6
10 files changed, 30 insertions, 31 deletions
diff --git a/src/core/ngx_md5.h b/src/core/ngx_md5.h
index eeba97e86..f2e99bc98 100644
--- 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 78f52c5ce..f158fd4dc 100644
--- 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 98919ae2f..8c9fad6f9 100644
--- 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 36cecdb7b..fb2578bf3 100644
--- 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 dfa5fa587..b61e2a6b1 100644
--- 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 29611f486..115508954 100644
--- 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 1a401bc97..a6b78a5aa 100644
--- 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 db9a83450..6361b3ce0 100644
--- 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 167f2eca3..5cbb1285e 100644
--- 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 ac7a5c4c9..908d1f38b 100644
--- 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;
generated by cgit (git 2.34.1) at 2025-12-07 03:37:00 +0000