Latest update - 7226

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
+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;
+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;
}