<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16895">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: either<br><br>Change-Id: Iaf725bd7ec6a679838739c5e3229c0a105837886<br>---<br>M include/asterisk/abstract_jb.h<br>M res/res_pjsip_transport_websocket.c<br>M res/res_xmpp.c<br>3 files changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/95/16895/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/abstract_jb.h b/include/asterisk/abstract_jb.h</span><br><span>index 3e2467d..eab571b 100644</span><br><span>--- a/include/asterisk/abstract_jb.h</span><br><span>+++ b/include/asterisk/abstract_jb.h</span><br><span>@@ -182,7 +182,7 @@</span><br><span>  * \param time_left bridge time limit, or -1 if not set.</span><br><span>  *</span><br><span>  * Called from ast_generic_bridge() to determine the maximum time to wait for</span><br><span style="color: hsl(0, 100%, 40%);">- * activity in ast_waitfor_n() call. If neihter of the channels is using jb,</span><br><span style="color: hsl(120, 100%, 40%);">+ * activity in ast_waitfor_n() call. If neither of the channels is using jb,</span><br><span>  * this function returns the time limit passed.</span><br><span>  *</span><br><span>  * \return maximum time to wait.</span><br><span>@@ -219,7 +219,7 @@</span><br><span>  * \param c1 second bridged channel.</span><br><span>  *</span><br><span>  * Called from ast_generic_bridge() to deliver any frames, that should be delivered</span><br><span style="color: hsl(0, 100%, 40%);">- * for the moment of invocation. Does nothing if neihter of the channels is using jb</span><br><span style="color: hsl(120, 100%, 40%);">+ * for the moment of invocation. Does nothing if neither of the channels is using jb</span><br><span>  * or has any frames currently queued in. The function delivers frames usig ast_write()</span><br><span>  * each of the channels.</span><br><span>  */</span><br><span>diff --git a/res/res_pjsip_transport_websocket.c b/res/res_pjsip_transport_websocket.c</span><br><span>index 1b882da..bc38407 100644</span><br><span>--- a/res/res_pjsip_transport_websocket.c</span><br><span>+++ b/res/res_pjsip_transport_websocket.c</span><br><span>@@ -195,7 +195,7 @@</span><br><span>    }</span><br><span> </span><br><span>        /*</span><br><span style="color: hsl(0, 100%, 40%);">-       * The type_name here is mostly used by log messages eihter in</span><br><span style="color: hsl(120, 100%, 40%);">+         * The type_name here is mostly used by log messages either in</span><br><span>        * pjproject or Asterisk.  Other places are reconstituting subscriptions</span><br><span>      * after a restart (which could never work for a websocket connection anyway),</span><br><span>        * received MESSAGE requests to set PJSIP_TRANSPORT, and most importantly</span><br><span>diff --git a/res/res_xmpp.c b/res/res_xmpp.c</span><br><span>index 1815564..f11e4fe 100644</span><br><span>--- a/res/res_xmpp.c</span><br><span>+++ b/res/res_xmpp.c</span><br><span>@@ -3607,7 +3607,7 @@</span><br><span>               return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* Depending on the configuration of the client we eiher jump to requesting TLS, or authenticating */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Depending on the configuration of the client we either jump to requesting TLS, or authenticating */</span><br><span>       xmpp_client_change_state(client, (ast_test_flag(&clientcfg->flags, XMPP_USETLS) ? XMPP_STATE_REQUEST_TLS : XMPP_STATE_AUTHENTICATE));</span><br><span> </span><br><span>     return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16895">change 16895</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/+/16895"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iaf725bd7ec6a679838739c5e3229c0a105837886 </div>
<div style="display:none"> Gerrit-Change-Number: 16895 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Josh Soref <jsoref@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Friendly Automation </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>