On Thu, Mar 08, 2018 at 08:42:06AM +0800, Junwang Zhao wrote:
> I'm a little bit confused why the diffs are equal to each other,
> ASAICS, the changed code removed the effect of 'flags'?
>
> Can you explain a little bit since I just began to read the code base :)

"flags | ~NGX_HTTP_VAR_WEAK" would either evaluate to "all bits set"
or "all bits set except NGX_HTTP_VAR_WEAK" if this bit is not set in
"flags".

> 2018-03-07 23:29 GMT+08:00 Ruslan Ermilov <ru@nginx.com>:
> > details: http://hg.nginx.org/nginx/rev/0b1eb40de6da
> > branches:
> > changeset: 7226:0b1eb40de6da
> > user: Ruslan Ermilov <ru@nginx.com>
> > date: Wed Mar 07 18:28:12 2018 +0300
> > description:
> > Improved code readablity.
> >
> > No functional changes.
> >
> > diffstat:
> >
> > src/http/ngx_http_variables.c | 8 ++++++--
> > src/stream/ngx_stream_variables.c | 8 ++++++--
> > 2 files changed, 12 insertions(+), 4 deletions(-)
> >
> > diffs (50 lines):
> >
> > diff -r e80930e5e422 -r 0b1eb40de6da src/http/ngx_http_variables.c
> > --- a/src/http/ngx_http_variables.c Mon Mar 05 21:35:13 2018 +0300
> > +++ b/src/http/ngx_http_variables.c Wed Mar 07 18:28:12 2018 +0300
> > @@ -429,7 +429,9 @@ ngx_http_add_variable(ngx_conf_t *cf, ng
> > return NULL;
> > }
> >
> > - v->flags &= flags | ~NGX_HTTP_VAR_WEAK;
> > + if (!(flags & NGX_HTTP_VAR_WEAK)) {
> > + v->flags &= ~NGX_HTTP_VAR_WEAK;
> > + }
> >
> > return v;
> > }
> > @@ -494,7 +496,9 @@ ngx_http_add_prefix_variable(ngx_conf_t
> > return NULL;
> > }
> >
> > - v->flags &= flags | ~NGX_HTTP_VAR_WEAK;
> > + if (!(flags & NGX_HTTP_VAR_WEAK)) {
> > + v->flags &= ~NGX_HTTP_VAR_WEAK;
> > + }
> >
> > return v;
> > }
> > diff -r e80930e5e422 -r 0b1eb40de6da src/stream/ngx_stream_variables.c
> > --- a/src/stream/ngx_stream_variables.c Mon Mar 05 21:35:13 2018 +0300
> > +++ b/src/stream/ngx_stream_variables.c Wed Mar 07 18:28:12 2018 +0300
> > @@ -161,7 +161,9 @@ ngx_stream_add_variable(ngx_conf_t *cf,
> > 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_
> > return NULL;
> > }
> >
> > - v->flags &= flags | ~NGX_STREAM_VAR_WEAK;
> > + if (!(flags & NGX_STREAM_VAR_WEAK)) {
> > + v->flags &= ~NGX_STREAM_VAR_WEAK;
> > + }
> >
> > return v;
> > }
> > _______________________________________________
> > nginx-devel mailing list
> > nginx-devel@nginx.org
> > http://mailman.nginx.org/mailman/listinfo/nginx-devel
> _______________________________________________
> nginx-devel mailing list
> nginx-devel@nginx.org
> http://mailman.nginx.org/mailman/listinfo/nginx-devel
>

--
Ruslan Ermilov
Assume stupidity not malice
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel