[asterisk-commits] may: branch may/ooh323_ipv6_direct_rtp r321500 - /team/may/ooh323_ipv6_direct...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sat May 28 02:32:33 CDT 2011
Author: may
Date: Sat May 28 02:32:26 2011
New Revision: 321500
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321500
Log:
Merged revisions 316216,316218,316240,316293,316332-316333,316335,316337,316428,316430,316477,316519 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r316216 | dvossel | 2011-05-03 22:51:41 +0400 (Tue, 03 May 2011) | 15 lines
Merged revisions 316215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316215 | dvossel | 2011-05-03 13:49:48 -0500 (Tue, 03 May 2011) | 9 lines
Fixes a random crash (NULL reference) in res_odbc.c.
(closes issue #19180)
Reported by: pruiz
Patches:
tmp.diff uploaded by pruiz (license 1152)
Tested by: pruiz, seanbright
........
................
r316218 | dvossel | 2011-05-03 23:00:26 +0400 (Tue, 03 May 2011) | 16 lines
Merged revisions 316217 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316217 | dvossel | 2011-05-03 13:59:06 -0500 (Tue, 03 May 2011) | 9 lines
Never put the Require: timer header in an Invite.
This has already been discussed and should have been resolved earlier. View
revsion 285565's log for more information about why it is important to not
put timer in the Require header.
(closes issue #18704)
Reported by: mfrager
........
................
r316240 | rmudgett | 2011-05-03 23:22:29 +0400 (Tue, 03 May 2011) | 23 lines
Merged revisions 316224 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316224 | rmudgett | 2011-05-03 14:18:30 -0500 (Tue, 03 May 2011) | 16 lines
The dahdi_hangup() call does not clean up the channel fully.
After dahdi_hangup() has supposedly hungup an ISDN channel there is still
traffic on the S0-bus because the channel was not cleaned up fully.
Shuffled the hangup code to include some missing cleanup. Also fixed some
code formatting in the area. I think the primary missing clean up code
was the call to tone_zone_play_tone() to turn off any active tones on the
channel.
(closes issue #19188)
Reported by: jg1234
Patches:
issue19188_v1.8.patch uploaded by rmudgett (license 664)
Tested by: jg1234
........
................
r316293 | russell | 2011-05-04 00:45:32 +0400 (Wed, 04 May 2011) | 12 lines
Merged revisions 316265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316265 | russell | 2011-05-03 14:55:49 -0500 (Tue, 03 May 2011) | 5 lines
Fix a bunch of compiler warnings generated by gcc 4.6.0.
Most of these are -Wunused-but-set-variable, but there were a few others
mixed in here, as well.
........
................
r316332 | dvossel | 2011-05-04 01:45:46 +0400 (Wed, 04 May 2011) | 31 lines
Merged revisions 316330 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r316330 | dvossel | 2011-05-03 16:37:59 -0500 (Tue, 03 May 2011) | 24 lines
Merged revisions 316329 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r316329 | dvossel | 2011-05-03 16:29:55 -0500 (Tue, 03 May 2011) | 17 lines
Merged revisions 316328 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r316328 | dvossel | 2011-05-03 16:27:59 -0500 (Tue, 03 May 2011) | 10 lines
Fixes chan_local crashs in local_fixup()
Thanks OEJ for tracking down the issue and submitting the patch.
(closes issue #19053)
Reported by: oej
Tested by: oej
Review: https://reviewboard.asterisk.org/r/1158/
........
................
................
................
r316333 | russell | 2011-05-04 01:48:40 +0400 (Wed, 04 May 2011) | 9 lines
Merged revisions 316331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316331 | russell | 2011-05-03 16:41:11 -0500 (Tue, 03 May 2011) | 2 lines
Resolve another warning.
........
................
r316335 | dvossel | 2011-05-04 02:07:18 +0400 (Wed, 04 May 2011) | 14 lines
Merged revisions 316334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316334 | dvossel | 2011-05-03 17:05:59 -0500 (Tue, 03 May 2011) | 8 lines
Fixes framehook segfault on indicate
(closes issue #19215)
Reported by: irroot
Patches:
framehook_indicate.patch uploaded by irroot (license 52)
........
................
r316337 | russell | 2011-05-04 02:16:23 +0400 (Wed, 04 May 2011) | 15 lines
Merged revisions 316336 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316336 | russell | 2011-05-03 17:13:31 -0500 (Tue, 03 May 2011) | 8 lines
Use htons() instead of ntohs() in some places.
(closes issue #19200)
Reported by: wdoekes
Patches:
issue19200-trunk.patch uploaded by wdoekes (license 717)
issue19200-1.8.x.patch uploaded by wdoekes (license 717)
........
................
r316428 | tilghman | 2011-05-04 03:36:35 +0400 (Wed, 04 May 2011) | 16 lines
If multiple [general] contexts occur from sip.conf (usually due to external includes), merge them.
The original implementation of this did the merging of all contexts with the
same name in the realtime layer, but that implementation severely breaks
drivers which use the same context name (e.g. iax.conf, type={peer,user}).
Therefore, the implementation needs to do the merging for particular entries
only, based upon what contexts would allow that in the channel driver itself.
This implementation is for chan_sip only, but others could be added in the
future.
(closes issue #17957)
Reported by: marcelloceschia
Patches:
chan-sip_parsing-general_branch162.patch uploaded by marcelloceschia (license 1079)
Tested by: tilghman
................
r316430 | tilghman | 2011-05-04 04:13:23 +0400 (Wed, 04 May 2011) | 14 lines
Merged revisions 316429 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316429 | tilghman | 2011-05-03 19:12:25 -0500 (Tue, 03 May 2011) | 7 lines
Escape column names in case they contain illegal characters ('-') or reserved words.
(closes issue #19063)
Reported by: festr
Patches:
patch uploaded by festr (license 443)
........
................
r316477 | seanbright | 2011-05-04 06:39:11 +0400 (Wed, 04 May 2011) | 24 lines
Merged revisions 316476 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r316476 | seanbright | 2011-05-03 22:34:01 -0400 (Tue, 03 May 2011) | 17 lines
Merged revisions 316475 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r316475 | seanbright | 2011-05-03 22:23:01 -0400 (Tue, 03 May 2011) | 10 lines
Honor the C option to MeetMe when L is passed.
This fixes a case that r304773 and friends missed.
(closes issue #17317)
Reported by: var
Patches:
meetme-continue-on-l_16218.diff uploaded by var (license 1227)
Tested by: seanbright
........
................
................
r316519 | wedhorn | 2011-05-04 11:10:04 +0400 (Wed, 04 May 2011) | 7 lines
Cleanup skinny callinfo.
Cosolidated the working out of the callinfo to be sent into
transmit_callinfo. Replaced ambiguous sub->outgoing with calldirection
which can be SKINNY_INCOMING or SKINNY_OUTGOING (same value as the
skinny protocol).
................
Modified:
team/may/ooh323_ipv6_direct_rtp/ (props changed)
Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat May 28 02:32:26 2011
@@ -1,1 +1,1 @@
-/trunk:1-313143,313191,313280,313367,313383-313481,313483-313744,313781-313906,313908-313943,313945-315447,315453-316213
+/trunk:1-313143,313191,313280,313367,313383-313481,313483-313744,313781-313906,313908-313943,313945-315447,315453-316213,316216-316519
More information about the asterisk-commits
mailing list