kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-10496: [mod_v8] Fixing regression from FS-10496 when no settings exist in v8.conf.

This commit is contained in:
Marc Olivier Chouinard 2018-01-28 10:18:58 -05:00
parent 87bb7cb5fb
commit 3d9365edbb
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod/languages/mod_v8/mod_v8.cpp
View File

@ -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) { for (hook = switch_xml_child(settings, "hook"); hook; hook = hook->next) {
char *event = (char *)switch_xml_attr_soft(hook, "event"); char *event = (char *)switch_xml_attr_soft(hook, "event");
char *subclass = (char *)switch_xml_attr_soft(hook, "subclass"); char *subclass = (char *)switch_xml_attr_soft(hook, "subclass");
@ -533,7 +527,7 @@ void LoadScript(MaybeLocal<v8::Script> *v8_script, Isolate *isolate, const char
Do not cache if the caching is disabled Do not cache if the caching is disabled
Do not cache inline scripts 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; options = ScriptCompiler::kNoCompileOptions;
perf_log("Javascript caching is disabled.\n", script_file); perf_log("Javascript caching is disabled.\n", script_file);
} else { } else {
@ -1212,6 +1206,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_v8_load)
globals.v8platform = NULL; globals.v8platform = NULL;
globals.cache_expires_seconds = 0; globals.cache_expires_seconds = 0;
globals.performance_monitor = false; globals.performance_monitor = false;
globals.script_caching = switch_core_strdup(globals.pool, "disabled");
JSMain::Initialize(&globals.v8platform); JSMain::Initialize(&globals.v8platform);
switch_core_hash_init(&globals.compiled_script_hash); switch_core_hash_init(&globals.compiled_script_hash);