Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
r1682, r1683 merge:

typo and style fixes
This commit is contained in:
Igor Sysoev 2007-12-12 20:49:45 +00:00
parent 7c99942b42
commit 721df7ef24
10 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/ngx_md5.h
View file

@ -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

6
src/core/ngx_sha1.h
View file

@ -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_ */

9
src/http/modules/ngx_http_charset_filter_module.c
View file

@ -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:

2
src/http/modules/ngx_http_fastcgi_module.c
View file

@ -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;
}

4
src/http/ngx_http_core_module.c
View file

@ -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;

5
src/http/ngx_http_parse_time.c
View file

@ -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

2
src/mail/ngx_mail.h
View file

@ -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 {

12
src/os/unix/ngx_recv.c
View file

@ -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;

3
src/os/unix/ngx_send.c
View file

@ -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;

6
src/os/win32/ngx_wsarecv.c
View file

@ -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;