diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/ngx_event_openssl.c | 24 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_ssi_filter_module.c | 2 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_upstream_ip_hash_module.c | 16 | ||||
| -rw-r--r-- | src/http/modules/perl/ngx_http_perl_module.c | 2 | ||||
| -rw-r--r-- | src/imap/ngx_imap_handler.c | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_config.h | 2 |
6 files changed, 24 insertions, 24 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index 2217bd2b0..8ccc91220 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -1527,26 +1527,26 @@ ngx_ssl_remove_session(SSL_CTX *ssl, ngx_ssl_session_t *sess) do { if ((u_char) len == node->data) { - sess_id = (ngx_ssl_sess_id_t *) node; + sess_id = (ngx_ssl_sess_id_t *) node; - if (ngx_strncmp(id, sess_id->id, (size_t) len) == 0) { + if (ngx_strncmp(id, sess_id->id, (size_t) len) == 0) { - sess_id->next->prev = sess_id->prev; - sess_id->prev->next = sess_id->next; + sess_id->next->prev = sess_id->prev; + sess_id->prev->next = sess_id->next; - ngx_rbtree_delete(cache->session_rbtree, node); + ngx_rbtree_delete(cache->session_rbtree, node); - ngx_slab_free_locked(shpool, sess_id->session); + ngx_slab_free_locked(shpool, sess_id->session); #if (NGX_PTR_SIZE == 4) - ngx_slab_free_locked(shpool, sess_id->id); + ngx_slab_free_locked(shpool, sess_id->id); #endif - ngx_slab_free_locked(shpool, sess_id); + ngx_slab_free_locked(shpool, sess_id); - goto done; - } - } + goto done; + } + } - node = node->right; + node = node->right; } while (node != sentinel && hash == node->key); diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c index 1ee34db00..c8e11bf20 100644 --- a/src/http/modules/ngx_http_ssi_filter_module.c +++ b/src/http/modules/ngx_http_ssi_filter_module.c @@ -2381,7 +2381,7 @@ ngx_http_ssi_if(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, noregex = 0; flags = NGX_HTTP_SSI_ADD_ZERO; last--; - p++; + p++; } else { noregex = 1; diff --git a/src/http/modules/ngx_http_upstream_ip_hash_module.c b/src/http/modules/ngx_http_upstream_ip_hash_module.c index 1de019e05..e0cf8afc1 100644 --- a/src/http/modules/ngx_http_upstream_ip_hash_module.c +++ b/src/http/modules/ngx_http_upstream_ip_hash_module.c @@ -171,14 +171,14 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data) if (!peer->down) { - if (peer->max_fails == 0 || peer->fails < peer->max_fails) { - break; - } - - if (now - peer->accessed > peer->fail_timeout) { - peer->fails = 0; - break; - } + if (peer->max_fails == 0 || peer->fails < peer->max_fails) { + break; + } + + if (now - peer->accessed > peer->fail_timeout) { + peer->fails = 0; + break; + } } else { iphp->rrp.tried[n] |= m; diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c index 29296b6a2..a33a9f7ee 100644 --- a/src/http/modules/perl/ngx_http_perl_module.c +++ b/src/http/modules/perl/ngx_http_perl_module.c @@ -199,7 +199,7 @@ ngx_http_perl_handle_request(ngx_http_request_t *r) ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_perl_ctx_t)); if (ctx == NULL) { ngx_http_finalize_request(r, NGX_ERROR); - return; + return; } ngx_http_set_ctx(r, ctx, ngx_http_perl_module); diff --git a/src/imap/ngx_imap_handler.c b/src/imap/ngx_imap_handler.c index 1a3147ece..6ee6b331a 100644 --- a/src/imap/ngx_imap_handler.c +++ b/src/imap/ngx_imap_handler.c @@ -1191,7 +1191,7 @@ ngx_imap_do_auth(ngx_imap_session_t *s) s->state = 0; if (s->connection->read->timer_set) { - ngx_del_timer(s->connection->read); + ngx_del_timer(s->connection->read); } s->login_attempt++; diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index 696280a10..6bdc57c08 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -131,7 +131,7 @@ typedef int sig_atomic_t; #define NGX_PTR_SIZE 4 #define NGX_SIZE_T_LEN sizeof("-2147483648") - 1 -#define NGX_MAX_SIZE_T_VALUE 2147483647 +#define NGX_MAX_SIZE_T_VALUE 2147483647 #define NGX_TIME_T_LEN sizeof("-2147483648") - 1 #define NGX_TIME_T_SIZE 4 #define NGX_OFF_T_LEN sizeof("-9223372036854775807") - 1 |