diff --git a/app/nginx-1.11.10/src/core/ngx_murmurhash.c b/app/nginx-1.11.10/src/core/ngx_murmurhash.c index c31e0e035..5ade658dd 100644 --- a/app/nginx-1.11.10/src/core/ngx_murmurhash.c +++ b/app/nginx-1.11.10/src/core/ngx_murmurhash.c @@ -35,8 +35,10 @@ ngx_murmur_hash2(u_char *data, size_t len) switch (len) { case 3: h ^= data[2] << 16; + /* fall through */ case 2: h ^= data[1] << 8; + /* fall through */ case 1: h ^= data[0]; h *= 0x5bd1e995; diff --git a/app/nginx-1.11.10/src/http/ngx_http_parse.c b/app/nginx-1.11.10/src/http/ngx_http_parse.c index 9f9947316..c65f01529 100644 --- a/app/nginx-1.11.10/src/http/ngx_http_parse.c +++ b/app/nginx-1.11.10/src/http/ngx_http_parse.c @@ -1390,6 +1390,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes) goto done; case '+': r->plus_in_uri = 1; + /* fall through */ default: state = sw_usual; *u++ = ch; @@ -1431,6 +1432,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes) goto done; case '+': r->plus_in_uri = 1; + /* fall through */ default: state = sw_usual; *u++ = ch; @@ -1478,6 +1480,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes) goto done; case '+': r->plus_in_uri = 1; + /* fall through */ default: state = sw_usual; *u++ = ch; diff --git a/app/nginx-1.11.10/src/os/unix/ngx_process.c b/app/nginx-1.11.10/src/os/unix/ngx_process.c index 24a63fbf5..81009c40c 100644 --- a/app/nginx-1.11.10/src/os/unix/ngx_process.c +++ b/app/nginx-1.11.10/src/os/unix/ngx_process.c @@ -405,6 +405,7 @@ ngx_signal_handler(int signo) break; } ngx_debug_quit = 1; + /* fall through */ case ngx_signal_value(NGX_SHUTDOWN_SIGNAL): ngx_quit = 1; action = ", shutting down"; diff --git a/app/nginx-1.11.10/src/os/unix/ngx_process_cycle.c b/app/nginx-1.11.10/src/os/unix/ngx_process_cycle.c index aea167acb..1f646f96a 100644 --- a/app/nginx-1.11.10/src/os/unix/ngx_process_cycle.c +++ b/app/nginx-1.11.10/src/os/unix/ngx_process_cycle.c @@ -385,7 +385,12 @@ ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t n, ngx_int_t type) "start worker processes shm_open"); exit(2); } - (void) ftruncate(shm_fd, sizeof(sem_t)); + r = ftruncate(shm_fd, sizeof(sem_t)); + if (r == -1) { + ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno, + "start worker processes ftruncate"); + exit(2); + } ngx_ff_worker_sem = (sem_t *) mmap(NULL, sizeof(sem_t), PROT_READ|PROT_WRITE,MAP_SHARED, shm_fd, 0); if (ngx_ff_worker_sem == MAP_FAILED) {