From: Automerge script <automerge@asterisk.org>
Date: Wed, 13 Jun 2012 21:22:20 +0000 (+0000)
Subject: Merged revisions 368895,368899 via svnmerge from
X-Git-Tag: 10.7.0-digiumphones-rc1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c709ed085aed398e46bcc2fa0a10165c2f489f5;p=thirdparty%2Fasterisk.git

Merged revisions 368895,368899 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r368895 | mjordan | 2012-06-13 15:27:28 -0500 (Wed, 13 Jun 2012) | 21 lines

  Mark res_smdi/res_adsi as 'core' supported modules

  Recently, various issues surrounding weak attributes have caused problems with
  modules that rely on that feature to be enabled in menuselect.  This includes
  app_voicemail and chan_dahdi, as they both rely upon res_smdi and res_adsi,
  which, in certain circumstances, may not be enabled by default in menuselect.

  Because res_smdi/res_adsi are dependencies for chan_dahdi/app_voicemail, this
  patch marks both as 'core' supported modules.  This will allow both
  app_voicemail and chan_dahdi to be enabled as well, regardless of whether or
  not that system supports weak attributes.

  (issue AST-900)
  Reported by: Thomas Arimont

  (issue AST-885)
  Reported by: Denis Alberto Martinez
  ........

  Merged revisions 368894 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r368899 | mmichelson | 2012-06-13 16:13:30 -0500 (Wed, 13 Jun 2012) | 19 lines

  Fix a deadlock that occurs when func_volume is used on a local channel.

  This was discovered by trying to perform a call forward to an extension
  that makes use of func_volume. When the local channel is optimized away,
  the datastore on the local;2 channel would have its audiohook destroyed
  rather than detaching the audiohook from the channel and then destroying
  it.

  With this patch, func_volume's datastore destructor takes the proper
  route of detaching the audiohook and then destroying it.

  (closes issue ASTERISK-19611)
  reported by Volker Sauer
  Patches:
  	ASTERISK-19611.patch uploaded by Mark Michelson (license #5049)
  ........

  Merged revisions 368898 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@368917 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/funcs/func_volume.c b/funcs/func_volume.c
index 39b5a8a08e..ce10b56807 100644
--- a/funcs/func_volume.c
+++ b/funcs/func_volume.c
@@ -90,6 +90,9 @@ static void destroy_callback(void *data)
 	struct volume_information *vi = data;
 
 	/* Destroy the audiohook, and destroy ourselves */
+	ast_audiohook_lock(&vi->audiohook);
+	ast_audiohook_detach(&vi->audiohook);
+	ast_audiohook_unlock(&vi->audiohook);
 	ast_audiohook_destroy(&vi->audiohook);
 	ast_free(vi);
 
diff --git a/res/res_adsi.c b/res/res_adsi.c
index 684d8f213c..19fb713b2d 100644
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -31,7 +31,7 @@
  */
 
 /*** MODULEINFO
-	<support_level>extended</support_level>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_smdi.c b/res/res_smdi.c
index e0bde6959f..cc49b98e99 100644
--- a/res/res_smdi.c
+++ b/res/res_smdi.c
@@ -32,7 +32,7 @@
  */
 
 /*** MODULEINFO
-	<support_level>extended</support_level>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"