diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_connection.c | 2 | ||||
| -rw-r--r-- | src/event/ngx_event_openssl.c | 2 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_fastcgi_module.c | 3 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_scgi_module.c | 3 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_uwsgi_module.c | 3 | ||||
| -rw-r--r-- | src/http/ngx_http_busy_lock.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 4 | ||||
| -rw-r--r-- | src/mail/ngx_mail_core_module.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_process.c | 2 |
9 files changed, 14 insertions, 9 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 6e09eb80a..4d1aa0d1b 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -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 (setsockopt(ls[i].fd, IPPROTO_TCP, TCP_KEEPIDLE, diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index 6b9dba16b..fe5cc337d 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -478,6 +478,7 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file) 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 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name) return NGX_OK; } + ngx_int_t ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags) { diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c index 78ebadc05..bbdd64cdc 100644 --- a/src/http/modules/ngx_http_fastcgi_module.c +++ b/src/http/modules/ngx_http_fastcgi_module.c @@ -2432,7 +2432,8 @@ ngx_http_fastcgi_merge_params(ngx_conf_t *cf, 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 ) { diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c index 538557377..bb9f6af51 100644 --- a/src/http/modules/ngx_http_scgi_module.c +++ b/src/http/modules/ngx_http_scgi_module.c @@ -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 (NGX_HTTP_CACHE) - && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL)) + && ((conf->upstream.cache == NULL) + == (prev->upstream.cache == NULL)) #endif ) { diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c index 73bbdda4d..931f3d2a2 100644 --- a/src/http/modules/ngx_http_uwsgi_module.c +++ b/src/http/modules/ngx_http_uwsgi_module.c @@ -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 (NGX_HTTP_CACHE) - && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL)) + && ((conf->upstream.cache == NULL) + == (prev->upstream.cache == NULL)) #endif ) { diff --git a/src/http/ngx_http_busy_lock.c b/src/http/ngx_http_busy_lock.c index cd8e07cd6..3b4b28c8b 100644 --- a/src/http/ngx_http_busy_lock.c +++ b/src/http/ngx_http_busy_lock.c @@ -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) { 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; diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 0dbe8b01d..7504a2c64 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -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) { 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) { 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; } diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c index 52a536936..f79913b0a 100644 --- a/src/mail/ngx_mail_core_module.c +++ b/src/mail/ngx_mail_core_module.c @@ -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 = { - ngx_conf_deprecated, "so_keepalive", + ngx_conf_deprecated, "so_keepalive", "so_keepalive\" parameter of the \"listen" }; diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index 038b5707f..5713ca8e1 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -544,7 +544,7 @@ ngx_process_get_status(void) static void ngx_unlock_mutexes(ngx_pid_t pid) -{ +{ ngx_uint_t i; ngx_shm_zone_t *shm_zone; ngx_list_part_t *part; |