mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 09:42:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Whitespace fixes.

Browse Source
This commit is contained in:
Maxim Dounin 2012-03-05 18:09:06 +00:00
parent 35e735523e
commit ee187436af
9 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ngx_connection.c
View File

@ -514,7 +514,7 @@ ngx_configure_listening_sockets(ngx_cycle_t *cycle)
} }
} }
#if (NGX_HAVE_KEEPALIVE_TUNABLE) #if (NGX_HAVE_KEEPALIVE_TUNABLE)
if (ls[i].keepidle) { if (ls[i].keepidle) {
if (setsockopt(ls[i].fd, IPPROTO_TCP, TCP_KEEPIDLE, if (setsockopt(ls[i].fd, IPPROTO_TCP, TCP_KEEPIDLE,

2
src/event/ngx_event_openssl.c
View File

@ -478,6 +478,7 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
return NGX_OK; return NGX_OK;
} }
ngx_int_t ngx_int_t
ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name) ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
{ {
@ -518,6 +519,7 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
return NGX_OK; return NGX_OK;
} }
ngx_int_t ngx_int_t
ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags) ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags)
{ {

3
src/http/modules/ngx_http_fastcgi_module.c
View File

@ -2432,7 +2432,8 @@ ngx_http_fastcgi_merge_params(ngx_conf_t *cf,
if (prev->headers_hash.buckets if (prev->headers_hash.buckets
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
&& ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL)) && ((conf->upstream.cache == NULL)
== (prev->upstream.cache == NULL))
#endif #endif
) )
{ {

3
src/http/modules/ngx_http_scgi_module.c
View File

@ -1384,7 +1384,8 @@ ngx_http_scgi_merge_params(ngx_conf_t *cf, ngx_http_scgi_loc_conf_t *conf,
if (prev->headers_hash.buckets if (prev->headers_hash.buckets
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
&& ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL)) && ((conf->upstream.cache == NULL)
== (prev->upstream.cache == NULL))
#endif #endif
) )
{ {

3
src/http/modules/ngx_http_uwsgi_module.c
View File

@ -1441,7 +1441,8 @@ ngx_http_uwsgi_merge_params(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *conf,
if (prev->headers_hash.buckets if (prev->headers_hash.buckets
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
&& ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL)) && ((conf->upstream.cache == NULL)
== (prev->upstream.cache == NULL))
#endif #endif
) )
{ {

2
src/http/ngx_http_busy_lock.c
View File

@ -300,7 +300,7 @@ char *ngx_http_set_busy_lock_slot(ngx_conf_t *cf, ngx_command_t *cmd,
if (bl->timeout == 0 && bl->max_waiting) { if (bl->timeout == 0 && bl->max_waiting) {
ngx_conf_log_error(NGX_LOG_WARN, cf, 0, 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; return NGX_CONF_OK;

4
src/http/ngx_http_core_module.c
View File

@ -3970,7 +3970,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
} }
} }
if (lsopt.tcp_keepidle == 0 && lsopt.tcp_keepintvl == 0 if (lsopt.tcp_keepidle == 0 && lsopt.tcp_keepintvl == 0
&& lsopt.tcp_keepcnt == 0) && lsopt.tcp_keepcnt == 0)
{ {
goto invalid_so_keepalive; goto invalid_so_keepalive;
@ -4629,7 +4629,7 @@ ngx_http_core_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
if (max == 0) { if (max == 0) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 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; return NGX_CONF_ERROR;
} }

2
src/mail/ngx_mail_core_module.c
View File

@ -26,7 +26,7 @@ static char *ngx_mail_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd,
static ngx_conf_deprecated_t ngx_conf_deprecated_so_keepalive = { 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" "so_keepalive\" parameter of the \"listen"
}; };

2
src/os/unix/ngx_process.c
View File

@ -544,7 +544,7 @@ ngx_process_get_status(void)
static void static void
ngx_unlock_mutexes(ngx_pid_t pid) ngx_unlock_mutexes(ngx_pid_t pid)
{ {
ngx_uint_t i; ngx_uint_t i;
ngx_shm_zone_t *shm_zone; ngx_shm_zone_t *shm_zone;
ngx_list_part_t *part; ngx_list_part_t *part;