From 9a0e71dff010905eb4c0b17c69a215b3a996ec89 Mon Sep 17 00:00:00 2001 From: Hakase Date: Thu, 8 Mar 2018 11:06:57 +0900 Subject: [PATCH] Latest update - 7226 --- auto.sh | 1 + src/http/ngx_http_variables.c | 8 ++++++-- src/http/v2/ngx_http_v2.c | 4 ++-- src/stream/ngx_stream_log_module.c | 3 ++- src/stream/ngx_stream_variables.c | 8 ++++++-- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/auto.sh b/auto.sh index 013888c..05f18c9 100755 --- a/auto.sh +++ b/auto.sh @@ -86,6 +86,7 @@ auto/configure \ --add-module=./lib/ngx_brotli \ --add-module=./lib/ngx_pagespeed ${PS_NGX_EXTRA_FLAGS} \ --add-module=./lib/ngx-fancyindex \ +--add-module=./lib/sass-nginx-module \ --add-module=./lib/nginx-ct \ --add-module=./lib/naxsi/naxsi_src \ --add-module=./lib/nginx-module-vts \ diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c index 79875b2..f1f7e75 100644 --- a/src/http/ngx_http_variables.c +++ b/src/http/ngx_http_variables.c @@ -434,7 +434,9 @@ ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags) return NULL; } - v->flags &= flags | ~NGX_HTTP_VAR_WEAK; + if (!(flags & NGX_HTTP_VAR_WEAK)) { + v->flags &= ~NGX_HTTP_VAR_WEAK; + } return v; } @@ -499,7 +501,9 @@ ngx_http_add_prefix_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags) return NULL; } - v->flags &= flags | ~NGX_HTTP_VAR_WEAK; + if (!(flags & NGX_HTTP_VAR_WEAK)) { + v->flags &= ~NGX_HTTP_VAR_WEAK; + } return v; } diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c index 75697f7..279cac5 100644 --- a/src/http/v2/ngx_http_v2.c +++ b/src/http/v2/ngx_http_v2.c @@ -785,8 +785,8 @@ ngx_http_v2_state_head(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end) type, h2c->state.flags, h2c->state.length, h2c->state.sid); if (type >= NGX_HTTP_V2_FRAME_STATES) { - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "http2 frame with unknown type %ui", type); + ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, + "client sent frame with unknown type %ui", type); return ngx_http_v2_state_skip(h2c, pos, end); } diff --git a/src/stream/ngx_stream_log_module.c b/src/stream/ngx_stream_log_module.c index 8e09471..0ff7f42 100644 --- a/src/stream/ngx_stream_log_module.c +++ b/src/stream/ngx_stream_log_module.c @@ -868,7 +868,8 @@ ngx_stream_log_json_variable(ngx_stream_session_t *s, u_char *buf, static size_t -ngx_stream_log_unescaped_variable_getlen(ngx_stream_session_t *s, uintptr_t data) +ngx_stream_log_unescaped_variable_getlen(ngx_stream_session_t *s, + uintptr_t data) { ngx_stream_variable_value_t *value; diff --git a/src/stream/ngx_stream_variables.c b/src/stream/ngx_stream_variables.c index 95ae12b..d1526a9 100644 --- a/src/stream/ngx_stream_variables.c +++ b/src/stream/ngx_stream_variables.c @@ -161,7 +161,9 @@ ngx_stream_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags) return NULL; } - v->flags &= flags | ~NGX_STREAM_VAR_WEAK; + if (!(flags & NGX_STREAM_VAR_WEAK)) { + v->flags &= ~NGX_STREAM_VAR_WEAK; + } return v; } @@ -227,7 +229,9 @@ ngx_stream_add_prefix_variable(ngx_conf_t *cf, ngx_str_t *name, return NULL; } - v->flags &= flags | ~NGX_STREAM_VAR_WEAK; + if (!(flags & NGX_STREAM_VAR_WEAK)) { + v->flags &= ~NGX_STREAM_VAR_WEAK; + } return v; }