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

Prevent unloading of embedded languages modules (also fixes MODLANG-121) 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14491 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Mathieu Rene 2009-08-11 16:03:31 +00:00
parent cf2f46db2b
commit 13e6519066
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod/languages/mod_java/modjava.c
View File

@ -261,7 +261,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_java_load)
} }
else else
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating memory pool\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating memory pool\n");
return status;
return status == SWITCH_STATUS_SUCCESS ? SWITCH_STATUS_NOUNLOAD : status;
} }
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_java_shutdown) SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_java_shutdown)

2
src/mod/languages/mod_lua/mod_lua.cpp
View File

@ -462,7 +462,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_lua_load)
do_config(); do_config();
/* indicate that the module should continue to be loaded */ /* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_NOUNLOAD;
} }
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lua_shutdown) SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lua_shutdown)

2
src/mod/languages/mod_managed/mod_managed.cpp
View File

@ -363,7 +363,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load)
SWITCH_ADD_API(api_interface, "managed", "Run a module as an API function (Execute)", managed_api_function, "<module> [<args>]"); SWITCH_ADD_API(api_interface, "managed", "Run a module as an API function (Execute)", managed_api_function, "<module> [<args>]");
SWITCH_ADD_APP(app_interface, "managed", "Run CLI App", "Run an App on a channel", managed_app_function, "<modulename> [<args>]", SAF_NONE); SWITCH_ADD_APP(app_interface, "managed", "Run CLI App", "Run an App on a channel", managed_app_function, "<modulename> [<args>]", SAF_NONE);
SWITCH_ADD_API(api_interface, "managedreload", "Force [re]load of a file", managedreload_api_function, "<filename>"); SWITCH_ADD_API(api_interface, "managedreload", "Force [re]load of a file", managedreload_api_function, "<filename>");
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_NOUNLOAD;
} }
#ifdef _MANAGED #ifdef _MANAGED

2
src/mod/languages/mod_perl/mod_perl.c
View File

@ -493,7 +493,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_perl_load)
do_config(); do_config();
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_NOUNLOAD;
} }
/* For Emacs: /* For Emacs:

2
src/mod/languages/mod_python/mod_python.c
View File

@ -426,7 +426,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_python_load)
SAF_SUPPORT_NOMEDIA); SAF_SUPPORT_NOMEDIA);
/* indicate that the module should continue to be loaded */ /* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_NOUNLOAD;
} }
/* /*

2
src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
View File

@ -3751,7 +3751,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load)
curl_global_init(CURL_GLOBAL_ALL); curl_global_init(CURL_GLOBAL_ALL);
/* indicate that the module should continue to be loaded */ /* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_NOUNLOAD;
} }
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown) SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown)