[svn-commits] bebuild: tag 11.9.0-rc2 r412324 - in /tags/11.9.0-rc2: ./ apps/ include/aster...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Mon Apr 14 13:13:52 CDT 2014


Author: bebuild
Date: Mon Apr 14 13:13:44 2014
New Revision: 412324

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=412324
Log:
Merge fixes for 11.9.0-rc2; update ChangeLog

Merge:
 * 411633 for ASTERISK-23559
 * 412305 for ASTERISK-23616


Modified:
    tags/11.9.0-rc2/   (props changed)
    tags/11.9.0-rc2/ChangeLog
    tags/11.9.0-rc2/apps/app_voicemail.c
    tags/11.9.0-rc2/include/asterisk/options.h
    tags/11.9.0-rc2/main/asterisk.c
    tags/11.9.0-rc2/main/autoservice.c
    tags/11.9.0-rc2/main/channel.c
    tags/11.9.0-rc2/utils/extconf.c

Propchange: tags/11.9.0-rc2/
------------------------------------------------------------------------------
    svn:mergeinfo = /branches/11:411633,412305

Modified: tags/11.9.0-rc2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/11.9.0-rc2/ChangeLog?view=diff&rev=412324&r1=412323&r2=412324
==============================================================================
--- tags/11.9.0-rc2/ChangeLog (original)
+++ tags/11.9.0-rc2/ChangeLog Mon Apr 14 13:13:44 2014
@@ -1,3 +1,27 @@
+2014-04-14  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 11.9.0-rc2 Released.
+
+	* autoservice: fix reference leak of logger callid.
+
+	  autoservice acquires a local reference to the logger callid of each
+	  channel in a loop.  This local reference was not released, causing
+	  the callid of every channel in autoservice to leak. This change moves
+	  the callid unref inside the loop.
+
+	  ASTERISK-23616 #close
+	  Reported by: ibercom
+
+	* app_voicemail: fix missing symbol
+
+	  ASTERISK-23391 caused a regression where the symbol 'defaultlanguage'
+	  was used by app_voicemail but not exported by main/asterisk. This
+	  change renames the variable to ast_defaultlanguage. The variable was
+	  already renamed in Asterisk 12+.
+
+	  (closes issue ASTERISK-23559)
+	  Reported by: Corey Farrell
+
 2014-03-28  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 11.9.0-rc1 Released.

Modified: tags/11.9.0-rc2/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/tags/11.9.0-rc2/apps/app_voicemail.c?view=diff&rev=412324&r1=412323&r2=412324
==============================================================================
--- tags/11.9.0-rc2/apps/app_voicemail.c (original)
+++ tags/11.9.0-rc2/apps/app_voicemail.c Mon Apr 14 13:13:44 2014
@@ -12046,7 +12046,7 @@
 			ast_copy_string(buf, vmu->pager, len);
 		} else if (!strncasecmp(arg.attribute, "language", 8)) {
 			const char *lang = S_OR(vmu->language, chan ?
-				ast_channel_language(chan) : defaultlanguage);
+				ast_channel_language(chan) : ast_defaultlanguage);
 			ast_copy_string(buf, lang, len);
 		} else if (!strncasecmp(arg.attribute, "locale", 6)) {
 			ast_copy_string(buf, vmu->locale, len);

Modified: tags/11.9.0-rc2/include/asterisk/options.h
URL: http://svnview.digium.com/svn/asterisk/tags/11.9.0-rc2/include/asterisk/options.h?view=diff&rev=412324&r1=412323&r2=412324
==============================================================================
--- tags/11.9.0-rc2/include/asterisk/options.h (original)
+++ tags/11.9.0-rc2/include/asterisk/options.h Mon Apr 14 13:13:44 2014
@@ -162,7 +162,7 @@
 #if defined(HAVE_SYSINFO)
 extern long option_minmemfree;		/*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */
 #endif
-extern char defaultlanguage[];
+extern char ast_defaultlanguage[];
 
 extern struct timeval ast_startuptime;
 extern struct timeval ast_lastreloadtime;

Modified: tags/11.9.0-rc2/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/tags/11.9.0-rc2/main/asterisk.c?view=diff&rev=412324&r1=412323&r2=412324
==============================================================================
--- tags/11.9.0-rc2/main/asterisk.c (original)
+++ tags/11.9.0-rc2/main/asterisk.c Mon Apr 14 13:13:44 2014
@@ -243,7 +243,7 @@
 
 struct console consoles[AST_MAX_CONNECTS];
 
-char defaultlanguage[MAX_LANGUAGE] = DEFAULT_LANGUAGE;
+char ast_defaultlanguage[MAX_LANGUAGE] = DEFAULT_LANGUAGE;
 
 static int ast_el_add_history(char *);
 static int ast_el_read_history(char *);
@@ -504,7 +504,7 @@
 	ast_cli(a->fd, "  System:                      %s/%s built by %s on %s %s\n", ast_build_os, ast_build_kernel, ast_build_user, ast_build_machine, ast_build_date);
 	ast_cli(a->fd, "  System name:                 %s\n", ast_config_AST_SYSTEM_NAME);
 	ast_cli(a->fd, "  Entity ID:                   %s\n", eid_str);
-	ast_cli(a->fd, "  Default language:            %s\n", defaultlanguage);
+	ast_cli(a->fd, "  Default language:            %s\n", ast_defaultlanguage);
 	ast_cli(a->fd, "  Language prefix:             %s\n", ast_language_is_prefix ? "Enabled" : "Disabled");
 	ast_cli(a->fd, "  User name and group:         %s/%s\n", ast_config_AST_RUN_USER, ast_config_AST_RUN_GROUP);
 	ast_cli(a->fd, "  Executable includes:         %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_EXEC_INCLUDES) ? "Enabled" : "Disabled");
@@ -3448,7 +3448,7 @@
 		} else if (!strcasecmp(v->name, "languageprefix")) {
 			ast_language_is_prefix = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "defaultlanguage")) {
-			ast_copy_string(defaultlanguage, v->value, MAX_LANGUAGE);
+			ast_copy_string(ast_defaultlanguage, v->value, MAX_LANGUAGE);
 		} else if (!strcasecmp(v->name, "lockmode")) {
 			if (!strcasecmp(v->value, "lockfile")) {
 				ast_set_lock_type(AST_LOCK_TYPE_LOCKFILE);

Modified: tags/11.9.0-rc2/main/autoservice.c
URL: http://svnview.digium.com/svn/asterisk/tags/11.9.0-rc2/main/autoservice.c?view=diff&rev=412324&r1=412323&r2=412324
==============================================================================
--- tags/11.9.0-rc2/main/autoservice.c (original)
+++ tags/11.9.0-rc2/main/autoservice.c Mon Apr 14 13:13:44 2014
@@ -131,6 +131,9 @@
 
 		callid = ast_channel_callid(chan);
 		ast_callid_threadassoc_change(callid);
+		if (callid) {
+			callid = ast_callid_unref(callid);
+		}
 
 		f = ast_read(chan);
 
@@ -174,11 +177,6 @@
 		}
 	}
 
-	if (callid) {
-		ast_callid_threadassoc_remove();
-		callid = ast_callid_unref(callid);
-	}
-
 	asthread = AST_PTHREADT_NULL;
 
 	return NULL;

Modified: tags/11.9.0-rc2/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/tags/11.9.0-rc2/main/channel.c?view=diff&rev=412324&r1=412323&r2=412324
==============================================================================
--- tags/11.9.0-rc2/main/channel.c (original)
+++ tags/11.9.0-rc2/main/channel.c Mon Apr 14 13:13:44 2014
@@ -1129,7 +1129,7 @@
 
 	AST_LIST_HEAD_INIT_NOLOCK(ast_channel_autochans(tmp));
 
-	ast_channel_language_set(tmp, defaultlanguage);
+	ast_channel_language_set(tmp, ast_defaultlanguage);
 
 	ast_channel_tech_set(tmp, &null_tech);
 

Modified: tags/11.9.0-rc2/utils/extconf.c
URL: http://svnview.digium.com/svn/asterisk/tags/11.9.0-rc2/utils/extconf.c?view=diff&rev=412324&r1=412323&r2=412324
==============================================================================
--- tags/11.9.0-rc2/utils/extconf.c (original)
+++ tags/11.9.0-rc2/utils/extconf.c Mon Apr 14 13:13:44 2014
@@ -1882,7 +1882,7 @@
 extern int option_debug;		/*!< Debugging */
 extern int option_maxcalls;		/*!< Maximum number of simultaneous channels */
 extern double option_maxload;
-extern char defaultlanguage[];
+extern char ast_defaultlanguage[];
 
 extern pid_t ast_mainpid;
 




More information about the svn-commits mailing list