mirror of
https://github.com/nginx/nginx.git
synced 2025-06-07 17:52:38 +08:00
Whitespace fixes.
This commit is contained in:
parent
35e735523e
commit
ee187436af
@ -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)
|
||||
{
|
||||
|
@ -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
|
||||
)
|
||||
{
|
||||
|
@ -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
|
||||
)
|
||||
{
|
||||
|
@ -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
|
||||
)
|
||||
{
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user