diff options
author | Russell Bryant <russell@russellbryant.com> | 2007-11-06 14:08:54 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2007-11-06 14:08:54 +0000 |
commit | 9bfd82cec21cf19ba3243738f85849e6ef681f51 (patch) | |
tree | 6a1fd6335a5024feab1f589fdd13c101a07e2833 /channels | |
parent | ed6e62a8e55bdad53472971fbb657cc4be9483bb (diff) |
Merged revisions 88805 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88805 | russell | 2007-11-05 16:07:54 -0600 (Mon, 05 Nov 2007) | 12 lines
After seeing crashes related to channel variables, I went looking around at the
ways that channel variables are handled. In general, they were not handled in
a thread-safe way. The channel _must_ be locked when reading or writing from/to
the channel variable list.
What I have done to improve this situation is to make pbx_builtin_setvar_helper()
and friends lock the channel when doing their thing. Asterisk API calls almost
all lock the channel for you as necessary, but this family of functions did not.
(closes issue #10923, reported by atis)
(closes issue #11159, reported by 850t)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88934 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/busy.h | 18 | ||||
-rw-r--r-- | channels/ringtone.h | 18 |
2 files changed, 0 insertions, 36 deletions
diff --git a/channels/busy.h b/channels/busy.h index 22d327931..6e5db8e47 100644 --- a/channels/busy.h +++ b/channels/busy.h @@ -1,21 +1,3 @@ -/* - * Asterisk -- An open source telephony toolkit. - * - * Copyright (C) 1999 - 2007, Digium, Inc. - * - * Mark Spencer <markster@digium.com> - * - * See http://www.asterisk.org for more information about - * the Asterisk project. Please do not directly contact - * any of the maintainers of this project for assistance; - * the project provides a web site, mailing lists and IRC - * channels for your use. - * - * This program is free software, distributed under the terms of - * the GNU General Public License Version 2. See the LICENSE file - * at the top of the source tree. - */ - /* busy.h: Generated from frequencies 480 and 620 by gentone. 400 samples */ static short busy[400] = { diff --git a/channels/ringtone.h b/channels/ringtone.h index 7750c0e77..559c42a7b 100644 --- a/channels/ringtone.h +++ b/channels/ringtone.h @@ -1,21 +1,3 @@ -/* - * Asterisk -- An open source telephony toolkit. - * - * Copyright (C) 1999 - 2007, Digium, Inc. - * - * Mark Spencer <markster@digium.com> - * - * See http://www.asterisk.org for more information about - * the Asterisk project. Please do not directly contact - * any of the maintainers of this project for assistance; - * the project provides a web site, mailing lists and IRC - * channels for your use. - * - * This program is free software, distributed under the terms of - * the GNU General Public License Version 2. See the LICENSE file - * at the top of the source tree. - */ - /* ringtone.h: Generated from frequencies 440 and 480 by gentone. 200 samples */ static short ringtone[200] = { |