Mercurial > hg > nginx
changeset 4522:14411ee4d89f
Whitespace fixes.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 05 Mar 2012 18:09:06 +0000 |
parents | dfca420d0446 |
children | 731c71ef051b |
files | src/core/ngx_connection.c src/event/ngx_event_openssl.c src/http/modules/ngx_http_fastcgi_module.c src/http/modules/ngx_http_scgi_module.c src/http/modules/ngx_http_uwsgi_module.c src/http/ngx_http_busy_lock.c src/http/ngx_http_core_module.c src/mail/ngx_mail_core_module.c src/os/unix/ngx_process.c |
diffstat | 9 files changed, 14 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_connection.c Mon Mar 05 18:08:23 2012 +0000 +++ b/src/core/ngx_connection.c Mon Mar 05 18:09:06 2012 +0000 @@ -514,7 +514,7 @@ } } -#if (NGX_HAVE_KEEPALIVE_TUNABLE) +#if (NGX_HAVE_KEEPALIVE_TUNABLE) if (ls[i].keepidle) { if (setsockopt(ls[i].fd, IPPROTO_TCP, TCP_KEEPIDLE,
--- a/src/event/ngx_event_openssl.c Mon Mar 05 18:08:23 2012 +0000 +++ b/src/event/ngx_event_openssl.c Mon Mar 05 18:09:06 2012 +0000 @@ -478,6 +478,7 @@ return NGX_OK; } + ngx_int_t ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name) { @@ -518,6 +519,7 @@ return NGX_OK; } + ngx_int_t ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags) {
--- a/src/http/modules/ngx_http_fastcgi_module.c Mon Mar 05 18:08:23 2012 +0000 +++ b/src/http/modules/ngx_http_fastcgi_module.c Mon Mar 05 18:09:06 2012 +0000 @@ -2432,7 +2432,8 @@ if (prev->headers_hash.buckets #if (NGX_HTTP_CACHE) - && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL)) + && ((conf->upstream.cache == NULL) + == (prev->upstream.cache == NULL)) #endif ) {
--- a/src/http/modules/ngx_http_scgi_module.c Mon Mar 05 18:08:23 2012 +0000 +++ b/src/http/modules/ngx_http_scgi_module.c Mon Mar 05 18:09:06 2012 +0000 @@ -1384,7 +1384,8 @@ if (prev->headers_hash.buckets #if (NGX_HTTP_CACHE) - && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL)) + && ((conf->upstream.cache == NULL) + == (prev->upstream.cache == NULL)) #endif ) {
--- a/src/http/modules/ngx_http_uwsgi_module.c Mon Mar 05 18:08:23 2012 +0000 +++ b/src/http/modules/ngx_http_uwsgi_module.c Mon Mar 05 18:09:06 2012 +0000 @@ -1441,7 +1441,8 @@ if (prev->headers_hash.buckets #if (NGX_HTTP_CACHE) - && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL)) + && ((conf->upstream.cache == NULL) + == (prev->upstream.cache == NULL)) #endif ) {
--- a/src/http/ngx_http_busy_lock.c Mon Mar 05 18:08:23 2012 +0000 +++ b/src/http/ngx_http_busy_lock.c Mon Mar 05 18:09:06 2012 +0000 @@ -300,7 +300,7 @@ if (bl->timeout == 0 && bl->max_waiting) { ngx_conf_log_error(NGX_LOG_WARN, cf, 0, - "busy lock waiting is useless with zero timeout, ignoring"); + "busy lock waiting is useless with zero timeout, ignoring"); } return NGX_CONF_OK;
--- a/src/http/ngx_http_core_module.c Mon Mar 05 18:08:23 2012 +0000 +++ b/src/http/ngx_http_core_module.c Mon Mar 05 18:09:06 2012 +0000 @@ -3970,7 +3970,7 @@ } } - if (lsopt.tcp_keepidle == 0 && lsopt.tcp_keepintvl == 0 + if (lsopt.tcp_keepidle == 0 && lsopt.tcp_keepintvl == 0 && lsopt.tcp_keepcnt == 0) { goto invalid_so_keepalive; @@ -4629,7 +4629,7 @@ if (max == 0) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "\"open_file_cache\" must have the \"max\" parameter"); + "\"open_file_cache\" must have the \"max\" parameter"); return NGX_CONF_ERROR; }
--- a/src/mail/ngx_mail_core_module.c Mon Mar 05 18:08:23 2012 +0000 +++ b/src/mail/ngx_mail_core_module.c Mon Mar 05 18:09:06 2012 +0000 @@ -26,7 +26,7 @@ static ngx_conf_deprecated_t ngx_conf_deprecated_so_keepalive = { - ngx_conf_deprecated, "so_keepalive", + ngx_conf_deprecated, "so_keepalive", "so_keepalive\" parameter of the \"listen" };