try to avoid skipping hangup hook

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
index 177b5586a1fae58c9115534580689c36fa86388a..790afab1e74942170faf50617efd7e229211d3ad 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -1608,7 +1608,7 @@ static jsval check_hangup_hook(struct js_session *jss, jsval * rp)
        jsval ret = JS_TRUE;
        char *resp;
 
-       if (!jss->check_state && jss->on_hangup && (jss->hook_state == CS_HANGUP || jss->hook_state == CS_ROUTING)) {
+       if (jss && !jss->check_state && jss->on_hangup && (jss->hook_state == CS_HANGUP || jss->hook_state == CS_ROUTING)) {
                jss->check_state++;
                argv[argc++] = OBJECT_TO_JSVAL(jss->obj);
                if (jss->hook_state == CS_HANGUP) {
@@ -1637,6 +1637,9 @@ static switch_status_t hanguphook(switch_core_session_t *session)
 
        if ((jss = switch_channel_get_private(channel, "jss"))) {
                switch_channel_state_t state = switch_channel_get_state(channel);
+               if (state > CS_HANGUP) {
+                       state = CS_HANGUP;
+               }
                if (jss->hook_state != state) {
                        jss->hook_state = state;
                        jss->check_state = 0;
@@ -2375,21 +2378,24 @@ static JSBool session_hangup(JSContext * cx, JSObject * obj, uintN argc, jsval *
 
        METHOD_SANITY_CHECK();
        channel = switch_core_session_get_channel(jss->session);
-       CHANNEL_SANITY_CHECK();
+       //CHANNEL_SANITY_CHECK();
 
-       if (argc > 1) {
-               if (JSVAL_IS_INT(argv[0])) {
-                       int32 i = 0;
-                       JS_ValueToInt32(cx, argv[0], &i);
-                       cause = i;
-               } else {
-                       cause_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-                       cause = switch_channel_str2cause(cause_name);
+       if (switch_channel_up(channel)) {
+               if (argc > 1) {
+                       if (JSVAL_IS_INT(argv[0])) {
+                               int32 i = 0;
+                               JS_ValueToInt32(cx, argv[0], &i);
+                               cause = i;
+                       } else {
+                               cause_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
+                               cause = switch_channel_str2cause(cause_name);
+                       }
                }
+
+               switch_channel_hangup(channel, cause);
+               switch_core_session_kill_channel(jss->session, SWITCH_SIG_KILL);
        }
 
-       switch_channel_hangup(channel, cause);
-       switch_core_session_kill_channel(jss->session, SWITCH_SIG_KILL);
        return JS_TRUE;
 }
 
@@ -3051,6 +3057,10 @@ static void session_destroy(JSContext * cx, JSObject * obj)
 
        if (cx && obj) {
                if ((jss = JS_GetPrivate(cx, obj))) {
+                       jsval rval;
+
+                       check_hangup_hook(jss, &rval);
+
                        JS_SetPrivate(cx, obj, NULL);
                        if (jss->speech && *jss->speech->sh.name) {
                                destroy_speech_engine(jss);
@@ -3623,7 +3633,7 @@ static void js_parse_and_execute(switch_core_session_t *session, const char *inp
        const char *script;
        int argc = 0, x = 0, y = 0;
        unsigned int flags = 0;
-       struct js_session *jss;
+       struct js_session *jss = NULL;
        JSContext *cx = NULL;
        jsval rval;
 

diff --git a/src/switch_core.c b/src/switch_core.c
index d48cd46dfca7c77673ce06f4f51c43d316ed0116..060e6cff8fa7d4cb8899cb30126a7f85d4bc8489 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -1235,6 +1235,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
        runtime.max_dtmf_duration = SWITCH_MAX_DTMF_DURATION;
        runtime.default_dtmf_duration = SWITCH_DEFAULT_DTMF_DURATION;
        runtime.min_dtmf_duration = SWITCH_MIN_DTMF_DURATION;
+       switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS);
 
        /* INIT APR and Create the pool context */
        if (apr_initialize() != SWITCH_STATUS_SUCCESS) {