Klaus Demo nginx / ee18743
Whitespace fixes. Maxim Dounin 10 years ago
9 changed file(s) with 14 addition(s) and 9 deletion(s). Raw diff Collapse all Expand all
513513 }
514514 }
515515
516 #if (NGX_HAVE_KEEPALIVE_TUNABLE)
516 #if (NGX_HAVE_KEEPALIVE_TUNABLE)
517517
518518 if (ls[i].keepidle) {
519519 if (setsockopt(ls[i].fd, IPPROTO_TCP, TCP_KEEPIDLE,
477477 return NGX_OK;
478478 }
479479
480
480481 ngx_int_t
481482 ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
482483 {
516517
517518 return NGX_OK;
518519 }
520
519521
520522 ngx_int_t
521523 ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags)
24312431
24322432 if (prev->headers_hash.buckets
24332433 #if (NGX_HTTP_CACHE)
2434 && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL))
2434 && ((conf->upstream.cache == NULL)
2435 == (prev->upstream.cache == NULL))
24352436 #endif
24362437 )
24372438 {
13831383
13841384 if (prev->headers_hash.buckets
13851385 #if (NGX_HTTP_CACHE)
1386 && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL))
1386 && ((conf->upstream.cache == NULL)
1387 == (prev->upstream.cache == NULL))
13871388 #endif
13881389 )
13891390 {
14401440
14411441 if (prev->headers_hash.buckets
14421442 #if (NGX_HTTP_CACHE)
1443 && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL))
1443 && ((conf->upstream.cache == NULL)
1444 == (prev->upstream.cache == NULL))
14441445 #endif
14451446 )
14461447 {
299299
300300 if (bl->timeout == 0 && bl->max_waiting) {
301301 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
302 "busy lock waiting is useless with zero timeout, ignoring");
302 "busy lock waiting is useless with zero timeout, ignoring");
303303 }
304304
305305 return NGX_CONF_OK;
39693969 }
39703970 }
39713971
3972 if (lsopt.tcp_keepidle == 0 && lsopt.tcp_keepintvl == 0
3972 if (lsopt.tcp_keepidle == 0 && lsopt.tcp_keepintvl == 0
39733973 && lsopt.tcp_keepcnt == 0)
39743974 {
39753975 goto invalid_so_keepalive;
46284628
46294629 if (max == 0) {
46304630 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4631 "\"open_file_cache\" must have the \"max\" parameter");
4631 "\"open_file_cache\" must have the \"max\" parameter");
46324632 return NGX_CONF_ERROR;
46334633 }
46344634
2525
2626
2727 static ngx_conf_deprecated_t ngx_conf_deprecated_so_keepalive = {
28 ngx_conf_deprecated, "so_keepalive",
28 ngx_conf_deprecated, "so_keepalive",
2929 "so_keepalive\" parameter of the \"listen"
3030 };
3131
543543
544544 static void
545545 ngx_unlock_mutexes(ngx_pid_t pid)
546 {
546 {
547547 ngx_uint_t i;
548548 ngx_shm_zone_t *shm_zone;
549549 ngx_list_part_t *part;