<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
via: 0806c3880104fff154802adb010713365ef6a0ed (commit)
via: 2b4f163826132cf55698008a22c065374320796a (commit)
via: 7386b9f8f55e6b2648bcfb3f9dafaf62dccd772e (commit)
via: 0d5fcf65a0fef932f32874da6f4bdddb69279c53 (commit)
from: d4b5b07b2a76404ed8bf5adf8bc2bc9c0cbd9f04 (commit)
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Leon de Rooij
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch
</pre></div>
<div class="highlight"><pre>committer: Mathieu Rene
comments:
Add libjpeg-dev to apt prereqs
<span style="color: #000080; font-weight: bold">diff --git a/support-d/prereq.sh b/support-d/prereq.sh</span>
<span style="color: #000080; font-weight: bold">index 4e214cf..8bc454d 100755</span>
<span style="color: #A00000">--- a/support-d/prereq.sh</span>
<span style="color: #00A000">+++ b/support-d/prereq.sh</span>
<span style="color: #800080; font-weight: bold">@@ -2,7 +2,7 @@ UNAME=`uname`</span>
NEEDED_PACKAGES_YUM='automake autoconf libtool screen gdb gcc-c++ compat-gcc-32 compat-gcc-32-c++ subversion ncurses-devel unixODBC-devel make wget'
<span style="color: #A00000">-NEEDED_PACAKGES_APT='automake autoconf libtool screen gdb libncurses5-dev unixodbc-dev subversion emacs22-nox gcc g++ make'</span>
<span style="color: #00A000">+NEEDED_PACAKGES_APT='automake autoconf libtool screen gdb libncurses5-dev unixodbc-dev subversion emacs22-nox gcc g++ make libjpeg-dev'</span>
NEEDED_PACKAGES_PKG_ADD=''
</pre></div>
<div class="highlight"><pre>committer: Mathieu Rene
comments:
Add session.ringReady() to check for CF_RING_READY
<span style="color: #000080; font-weight: bold">diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c</span>
<span style="color: #000080; font-weight: bold">index 1d6ee8d..a818c1d 100644</span>
<span style="color: #A00000">--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c</span>
<span style="color: #00A000">+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c</span>
<span style="color: #800080; font-weight: bold">@@ -2126,6 +2126,15 @@ static JSBool session_media_ready(JSContext * cx, JSObject * obj, uintN argc, js</span>
}
<span style="color: #00A000">+static JSBool session_ring_ready(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)</span>
<span style="color: #00A000">+{</span>
<span style="color: #00A000">+ struct js_session *jss = JS_GetPrivate(cx, obj);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ *rval = BOOLEAN_TO_JSVAL((jss && jss->session && switch_channel_test_flag(switch_core_session_get_channel(jss->session), CF_RING_READY)) ? JS_TRUE : JS_FALSE);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ return JS_TRUE;</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
static JSBool session_answered(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
{
struct js_session *jss = JS_GetPrivate(cx, obj);
<span style="color: #800080; font-weight: bold">@@ -2673,6 +2682,7 @@ static JSFunctionSpec session_methods[] = {</span>
{"ready", session_ready, 0},
{"answered", session_answered, 0},
{"mediaReady", session_media_ready, 0},
<span style="color: #00A000">+ {"ringReady", session_ring_ready, 0},</span>
{"waitForAnswer", session_wait_for_answer, 0},
{"waitForMedia", session_wait_for_media, 0},
{"getEvent", session_get_event, 0},
</pre></div>
<div class="highlight"><pre>committer: Mathieu Rene
comments:
xml_config: change min/max enforcements to >= instead of >
<span style="color: #000080; font-weight: bold">diff --git a/src/switch_xml_config.c b/src/switch_xml_config.c</span>
<span style="color: #000080; font-weight: bold">index b6b37bd..5ade057 100644</span>
<span style="color: #A00000">--- a/src/switch_xml_config.c</span>
<span style="color: #00A000">+++ b/src/switch_xml_config.c</span>
<span style="color: #800080; font-weight: bold">@@ -177,7 +177,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *ev</span>
if (int_options) {
/* Enforce validation options */
<span style="color: #A00000">- if ((int_options->enforce_min && !(intval > int_options->min)) || (int_options->enforce_max && !(intval < int_options->max))) {</span>
<span style="color: #00A000">+ if ((int_options->enforce_min && !(intval >= int_options->min)) || (int_options->enforce_max && !(intval <= int_options->max))) {</span>
/* Validation failed, set default */
intval = (int) (intptr_t) item->defaultvalue;
/* Then complain */
</pre></div>
========================================================================<pre>
Summary of changes:
.../languages/mod_spidermonkey/mod_spidermonkey.c | 10 ++++++++++
src/switch_xml_config.c | 2 +-
support-d/prereq.sh | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH Source</p>