[asterisk-commits] file: branch file/pimp_sip_media r381276 - /team/file/pimp_sip_media/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Feb 12 08:28:12 CST 2013
Author: file
Date: Tue Feb 12 08:28:08 2013
New Revision: 381276
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381276
Log:
Multiple revisions 381163,381180,381201,381223,381260
........
r381163 | root | 2013-02-11 11:18:24 -0400 (Mon, 11 Feb 2013) | 22 lines
Merged revisions 381160 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
................
r381160 | mjordan | 2013-02-11 09:11:47 -0600 (Mon, 11 Feb 2013) | 15 lines
Fix crash in res_xmpp when deleting pubsub node from CLI
An error existed in res_xmpp where it would attempt to delete attributes from
a node that itself was also deleted. Per the iksemel documentation, attributes
added using iks_insert are copied to the parent node's stack, and will be
reclaimed when that node is itself destroyed.
(closes issue ASTERISK-20982)
Reported by: marcelloceschia
patches:
delete-node-fix.diff uploaded by marcelloceschia (License 6036)
........
Merged revisions 381159 from http://svn.asterisk.org/svn/asterisk/branches/11
................
........
r381180 | root | 2013-02-11 14:17:56 -0400 (Mon, 11 Feb 2013) | 20 lines
Merged revisions 381177 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
........
r381177 | rmudgett | 2013-02-11 12:00:05 -0600 (Mon, 11 Feb 2013) | 13 lines
features: Don't cache a struct ast_app pointer.
Caching a struct ast_app pointer is not a good idea because someone could
unload the application. After the applicaiton unload the cached ast_app
pointer is no longer valid. Only pbx.c can cache the pointer because it
knows when the application is unloaded and removes the pointer.
* Fixed one-touch Monitor and MixMonitor to not cache the ast_app pointer
and not use the silly monitor_ok/mixmonitor_ok/stopmixmonitor_ok flags.
* Extracted bridge_check_monitor() from ast_bridge_call() and use propper
locking.
........
........
r381201 | root | 2013-02-11 15:18:45 -0400 (Mon, 11 Feb 2013) | 18 lines
Merged revisions 381195 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
........
r381195 | wedhorn | 2013-02-11 12:54:12 -0600 (Mon, 11 Feb 2013) | 11 lines
Fix some issues with skinny callid.
Add extra string to transmit_callinfo_var, Only set string2 to tonum for outgoing calls
and changes to send_callinfo and push_callinfo to not set callid name to last number.
(closes issue ASTERISK-21063)
Reported by: wedhorn
Tested by: snuffy, myself
Patches:
skinny-callinfoupdate03.diff uploaded by wedhorn (license 5019)
........
........
r381223 | root | 2013-02-11 17:18:45 -0400 (Mon, 11 Feb 2013) | 42 lines
Merged revisions 381214,381218-381219 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
................
r381214 | dlee | 2013-02-11 14:39:11 -0600 (Mon, 11 Feb 2013) | 8 lines
Minor fixes to res_json and test_json.
* Made input checking more consistent with other Asterisk code
* Added validation to ast_json_dump_new_file
* Fixed tests for ownereship semantics
(issue ASTERISK-20887)
................
r381218 | kmoore | 2013-02-11 15:10:53 -0600 (Mon, 11 Feb 2013) | 5 lines
Fix compilation error with REF_DEBUG
When the red/black tree work was committed, there was an extra ", " in
the REF_DEBUG definition of ao2_container_alloc_rbtree.
................
r381219 | kharwell | 2013-02-11 15:17:04 -0600 (Mon, 11 Feb 2013) | 18 lines
Properly load say.conf upon reload of module app_playback.
If say.conf did not exists prior to originally loading module app_playback it
would not load on subsequent reloads of the module once it had been created.
This occurred because upon reload of the app_playback module it would only
load a new configuration if an old one had previously existed. This fix simply
removed the association between checking if an old configuration existed and
the loading of the new one.
(closes issue ASTERISK-20800)
Reported by: pgoergler
........
Merged revisions 381216 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 381217 from http://svn.asterisk.org/svn/asterisk/branches/11
................
........
r381260 | root | 2013-02-12 00:18:41 -0400 (Tue, 12 Feb 2013) | 31 lines
Merged revisions 381256 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
........
r381256 | elguero | 2013-02-11 21:31:46 -0600 (Mon, 11 Feb 2013) | 24 lines
Adding Some More Manager Events To ConfBridge
Currently, ConfBridge does not send manager events for ConfbridgeMute,
ConfbridgeUnmute, ConfbridgeStartRecord and ConfbridgeStopRecord. This patch
adds these events to the manager.
The reporter's patch moves some other events up to the beginning of the file.
The patch being committed is based on the patch contributed from the reporter of
this issue. I have made a lot of modifications to the patch in order for it to
fit in better with what we currently are doing in the code when it comes to
manager events. I also made a few changes to the <see-also> elements on some of
the events.
(closes issue ASTERISK-20827)
Reported by: Clint Davis
Tested by: Clint Davis, Michael L. Young
Patches:
20827.diff uploaded by Clint Davis (license 6453)
asterisk-20827-confbridge-events.diff uploaded by
Michael L. Young (license 5026)
Review: https://reviewboard.asterisk.org/r/2309/
........
........
Merged revisions 381163,381180,381201,381223,381260 from http://svn.asterisk.org/svn/asterisk/team/group/pimp_my_sip
Modified:
team/file/pimp_sip_media/ (props changed)
Propchange: team/file/pimp_sip_media/
------------------------------------------------------------------------------
--- pimp-integrated (original)
+++ pimp-integrated Tue Feb 12 08:28:08 2013
@@ -1,1 +1,1 @@
-/team/group/pimp_my_sip:1-381156
+/team/group/pimp_my_sip:1-381275
More information about the asterisk-commits
mailing list