Merge branch 'master' into smgmaster

This commit is contained in:
Moises Silva committed 2011-02-18 22:52:05 -05:00
commit f3d8dc8ad3
76 files changed
+1363 -5256

No files matched your search

+2
View File
@@ -1555,6 +1555,8 @@ static void switch_load_core_config(const char *file)
if (tmp > -1 && tmp < 11) {
switch_core_session_ctl(SCSC_DEBUG_LEVEL, &tmp);
}
} else if (!strcasecmp(var, "multiple-registrations")) {
runtime.multiple_registrations = switch_true(val);
} else if (!strcasecmp(var, "sql-buffer-len")) {
int tmp = atoi(val);