Hakase/nginx-build
2
1 Fork 1
Code Issues Pull Requests Releases Activity

Latest update - 7226

Browse Source
This commit is contained in:
Hakase
2018-03-08 11:06:57 +09:00
parent 672cda8d88
commit 9a0e71dff0
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/http/ngx_http_variables.c
+6 -2
View File
@@ -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;
}
src/http/v2/ngx_http_v2.c
+2 -2
View File
@@ -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);
}
src/stream/ngx_stream_log_module.c
+2 -1
View File
@@ -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;
src/stream/ngx_stream_variables.c
+6 -2
View File
@@ -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;
}