<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16246">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">aelparse: Accept an included context with timings.<br><br>With Asterisk 1.6.0, in the main parser for the configuration file<br>extensions.conf, the separator was changed from vertical bar to comma.<br>However, the first separator was not changed in aelparse; it still had<br>to be a vertical bar, and no comma was allowed.<br><br>Additionally, this change allows the vertical bar for the first and<br>last parameter again, even in the main parser, because the vertical bar<br>was still accepted for the other parameters.<br><br>ASTERISK-29540<br><br>Change-Id: I882e17c73adf4bf2f20f9046390860d04a9f8d81<br>---<br>M main/pbx_include.c<br>M main/pbx_timing.c<br>M utils/extconf.c<br>3 files changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/pbx_include.c b/main/pbx_include.c</span><br><span>index 1bdc396..188bce1 100644</span><br><span>--- a/main/pbx_include.c</span><br><span>+++ b/main/pbx_include.c</span><br><span>@@ -94,7 +94,7 @@</span><br><span>     new_include->rname = p;</span><br><span>   strcpy(p, value);</span><br><span>    /* Strip off timing info, and process if it is there */</span><br><span style="color: hsl(0, 100%, 40%);">- if ((c = strchr(p, ',')) ) {</span><br><span style="color: hsl(120, 100%, 40%);">+  if ( (c = strchr(p, '|')) || (c = strchr(p, ',')) ) {</span><br><span>                *c++ = '\0';</span><br><span>                 new_include->hastime = ast_build_timing(&(new_include->timing), c);</span><br><span>        }</span><br><span>diff --git a/main/pbx_timing.c b/main/pbx_timing.c</span><br><span>index b3ef089..1f76ab8 100644</span><br><span>--- a/main/pbx_timing.c</span><br><span>+++ b/main/pbx_timing.c</span><br><span>@@ -217,7 +217,7 @@</span><br><span> </span><br><span>         /* count the number of fields in the timespec */</span><br><span>     for (j = 0, num_fields = 1; info[j] != '\0'; j++) {</span><br><span style="color: hsl(0, 100%, 40%);">-             if (info[j] == ',') {</span><br><span style="color: hsl(120, 100%, 40%);">+         if (info[j] == '|' || info[j] == ',') {</span><br><span>                      last_sep = j;</span><br><span>                        num_fields++;</span><br><span>                }</span><br><span>diff --git a/utils/extconf.c b/utils/extconf.c</span><br><span>index 674f5df..afc893c 100644</span><br><span>--- a/utils/extconf.c</span><br><span>+++ b/utils/extconf.c</span><br><span>@@ -3822,7 +3822,7 @@</span><br><span> </span><br><span>       /* count the number of fields in the timespec */</span><br><span>     for (j = 0, num_fields = 1; info[j] != '\0'; j++) {</span><br><span style="color: hsl(0, 100%, 40%);">-             if (info[j] == ',') {</span><br><span style="color: hsl(120, 100%, 40%);">+         if (info[j] == '|' || info[j] == ',') {</span><br><span>                      last_sep = j;</span><br><span>                        num_fields++;</span><br><span>                }</span><br><span>@@ -4525,7 +4525,7 @@</span><br><span>    new_include->rname = p;</span><br><span>   strcpy(p, value);</span><br><span>    /* Strip off timing info, and process if it is there */</span><br><span style="color: hsl(0, 100%, 40%);">- if ( (c = strchr(p, '|')) ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if ( (c = strchr(p, '|')) || (c = strchr(p, ',')) ) {</span><br><span>                *c++ = '\0';</span><br><span>                 new_include->hastime = ast_build_timing(&(new_include->timing), c);</span><br><span>        }</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16246">change 16246</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/16246"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: I882e17c73adf4bf2f20f9046390860d04a9f8d81 </div>
<div style="display:none"> Gerrit-Change-Number: 16246 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>