From 3d9365edbb7bab59a6b047930329e33013d2eb5a Mon Sep 17 00:00:00 2001 From: Marc Olivier Chouinard Date: Sun, 28 Jan 2018 10:18:58 -0500 Subject: [PATCH] FS-10496: [mod_v8] Fixing regression from FS-10496 when no settings exist in v8.conf. --- src/mod/languages/mod_v8/mod_v8.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/mod/languages/mod_v8/mod_v8.cpp b/src/mod/languages/mod_v8/mod_v8.cpp index 2a295283dd..636b93e5ac 100644 --- a/src/mod/languages/mod_v8/mod_v8.cpp +++ b/src/mod/languages/mod_v8/mod_v8.cpp @@ -358,12 +358,6 @@ static void load_configuration(void) } } -#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=5 - if (zstr(globals.script_caching)) { - globals.script_caching = switch_core_strdup(globals.pool, "disabled"); - } -#endif - for (hook = switch_xml_child(settings, "hook"); hook; hook = hook->next) { char *event = (char *)switch_xml_attr_soft(hook, "event"); char *subclass = (char *)switch_xml_attr_soft(hook, "subclass"); @@ -533,7 +527,7 @@ void LoadScript(MaybeLocal *v8_script, Isolate *isolate, const char Do not cache if the caching is disabled Do not cache inline scripts */ - if (!strcasecmp(globals.script_caching, "disabled") || !strcasecmp(globals.script_caching, "false") || !strcasecmp(globals.script_caching, "no") || !strcasecmp(script_file, "inline") || zstr(script_file)) { + if (!switch_true(globals.script_caching) || !strcasecmp(script_file, "inline") || zstr(script_file)) { options = ScriptCompiler::kNoCompileOptions; perf_log("Javascript caching is disabled.\n", script_file); } else { @@ -1212,6 +1206,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_v8_load) globals.v8platform = NULL; globals.cache_expires_seconds = 0; globals.performance_monitor = false; + globals.script_caching = switch_core_strdup(globals.pool, "disabled"); + JSMain::Initialize(&globals.v8platform); switch_core_hash_init(&globals.compiled_script_hash);