Re: [exim] 4.87 -> 4.88 readconf performance

Pàgina inicial
Delete this message
Reply to this message
Autor: Wayne
Data:  
A: exim-users
Assumpte: Re: [exim] 4.87 -> 4.88 readconf performance
On Tue, Mar 14, 2017 at 02:15:56PM +0200, Lena--- via Exim-users wrote:
> > >> It triggers when a macro name contains the sequence /_[ODH]/.
> > >
> > > Does it include $header_Date: ?
> > > A workaround: $header_date:
> >
> > Macro, not header.
>
> Even comment lines are searched for /_[ODH]/
> As far as I undrestand, every config line is searched before parsing.
> So, such line triggers creation of builtin macros:
>
>         condition = ${if match{$rheader_Date:}{\N \+0[56]00\N}}

>


The additional 'if ((p == t) ...' block below corrects the initial
problem.

  if (!macros_builtin_created)
    {
    const uschar * t, * p;
    uschar c;
    for (t = s; (p = CUstrchr(t, '_')); t = p+1) {
        if (c = p[1], c == 'O' || c == 'D' || c == 'H')
        {
            /* Don't trigger builtins on substrings. */
            if ((p == t) || (isspace(p[-1]) || (p[-1] == '=') )) {
               // fprintf(stderr, "%s: builtins create triggered by '%s'\n", __FUNCTION__, s);
               macros_create_builtin();
               break;
            }
        }
    }
    }


Unfortunately it still triggers if an assignment that should trigger
builtins is commented.

Ex.

NAME = CFG_DIR
will NOT trigger (good)

NAME = _DIR
will trigger (good)


# NAME = _DIR
will trigger (bad)

Is there a reason to scan within comment blocks?

Wayne