Commit Graph

17738 Commits

Author SHA1 Message Date
Jason Parker
907a387d05 Merged revisions 241230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r241230 | qwell | 2010-01-19 11:42:10 -0600 (Tue, 19 Jan 2010) | 10 lines
  
  Allow parallel make (-j) to work properly.
  
  After some back and forth with the reporter, we came up with the necessary changes.
  
  (closes issue #16489)
  Reported by: Chainsaw
  Patches:
        asterisk-1.6.2.1-parallel-make-minimal.patch uploaded by Chainsaw (license 723)
  Tested by: Chainsaw, qwell
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@241231 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-19 17:42:42 +00:00
Jason Parker
a27e27158a Blocked revisions 241098 via svnmerge
........
  r241098 | qwell | 2010-01-18 16:03:49 -0600 (Mon, 18 Jan 2010) | 8 lines
  
  Fix an RTP instance allocation failure on Solaris.
  
  (closes issue #16543)
  Reported by: crjw
  Patches:
        rtp_sin_family.patch uploaded by crjw (license 963)
  Tested by: crjw, qwell
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@241099 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-18 22:05:36 +00:00
Sean Bright
f89c76dd9c Merged revisions 241016 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r241016 | seanbright | 2010-01-18 14:57:52 -0500 (Mon, 18 Jan 2010) | 19 lines
  
  Merged revisions 241015 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r241015 | seanbright | 2010-01-18 14:54:19 -0500 (Mon, 18 Jan 2010) | 12 lines
    
    Plug a memory leak when reading configs with their comments.
    
    While reading through configuration files with the intent of returning their
    full contents (comments specifically) we allocated some memory and then forgot
    to free it.  This doesn't fix 16554 but clears up a leak I had in the lab.
    
    (issue #16554)
    Reported by: mav3rick
    Patches:
          issue16554_20100118.patch uploaded by seanbright (license 71)
    Tested by: seanbright
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@241017 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-18 20:01:46 +00:00
David Vossel
1b57e4ee1b Merged revisions 240887 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240887 | dvossel | 2010-01-18 10:45:28 -0600 (Mon, 18 Jan 2010) | 7 lines
  
  updated transmit_silence option documentation in asterisk.conf
  
  This patch updates the transmit_silence option to better document
  why the option exists, and what it affects.  Thanks to russell
  for providing the verbage for this update.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240890 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-18 16:46:43 +00:00
David Vossel
c9cb9f55fe Merged revisions 240842 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240842 | dvossel | 2010-01-18 09:52:55 -0600 (Mon, 18 Jan 2010) | 2 lines
  
  fixes spelling error.  s/memeber/member
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240845 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-18 15:55:34 +00:00
Sean Bright
bf915a27cb Merged revisions 240717 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240717 | seanbright | 2010-01-17 14:45:48 -0500 (Sun, 17 Jan 2010) | 5 lines
  
  Avoid a crash on Solaris when running 'core show functions.'
  
  (closes issue #16309)
  Reported by: asgaroth
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240718 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-17 19:47:43 +00:00
Sean Bright
fb56500a20 Merged revisions 240667 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240667 | seanbright | 2010-01-15 19:54:08 -0500 (Fri, 15 Jan 2010) | 2 lines
  
  Get MoH building on OpenSolaris.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240668 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-16 00:59:22 +00:00
Tilghman Lesher
ed6edf6908 Merged revisions 239665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r239665 | oej | 2010-01-13 04:45:19 -0600 (Wed, 13 Jan 2010) | 2 lines
  
  MAX() moved to utils.h
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-16 00:43:11 +00:00
Russell Bryant
bf86123d01 Merged revisions 240548 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r240548 | russell | 2010-01-15 17:06:32 -0600 (Fri, 15 Jan 2010) | 9 lines
  
  Merged revisions 240547 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r240547 | russell | 2010-01-15 17:06:11 -0600 (Fri, 15 Jan 2010) | 2 lines
    
    Fix a spelling error in the asterisk.conf sample.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240549 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-15 23:06:56 +00:00
Tilghman Lesher
c6084513fd Merged revisions 240499-240500 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240499 | tilghman | 2010-01-15 15:40:14 -0600 (Fri, 15 Jan 2010) | 9 lines
  
  The previous attempt at using a pipe to guarantee astcanary shutdown did not work.
  We're revisiting the previous patch, albeit with a method that overcomes the
  prior criticism that it was not POSIX-compliant.
  (closes issue #16602)
   Reported by: frawd
   Patches: 
         20100114__issue16602.diff.txt uploaded by tilghman (license 14)
   Tested by: frawd
........
  r240500 | tilghman | 2010-01-15 15:42:36 -0600 (Fri, 15 Jan 2010) | 2 lines
  
  Oops, missed an include
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240501 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-15 21:44:29 +00:00
Tilghman Lesher
c880b6fa71 Merged revisions 240415 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r240415 | tilghman | 2010-01-15 14:54:24 -0600 (Fri, 15 Jan 2010) | 22 lines
  
  Merged revisions 240414 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r240414 | tilghman | 2010-01-15 14:52:27 -0600 (Fri, 15 Jan 2010) | 15 lines
    
    Disallow leaving more than maxmsg voicemails.
    This is a possibility because our previous method assumed that no messages are
    left in parallel, which is not a safe assumption.  Due to the vmu structure
    duplication, it was necessary to track in-process messages via a separate
    structure.  If at some point, we switch vmu to an ao2-reference-counted
    structure, which would eliminate the prior noted duplication of structures,
    then we could incorporate this new in-process structure directly into vmu.
    (closes issue #16271)
     Reported by: sohosys
     Patches: 
           20100108__issue16271.diff.txt uploaded by tilghman (license 14)
           20100108__issue16271__trunk.diff.txt uploaded by tilghman (license 14)
           20100108__issue16271__1.6.0.diff.txt uploaded by tilghman (license 14)
     Tested by: jsutton
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240416 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-15 20:56:33 +00:00
Sean Bright
19031348c9 Merged revisions 240271 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240271 | seanbright | 2010-01-14 18:13:02 -0500 (Thu, 14 Jan 2010) | 7 lines
  
  Plug a memory leak in res_config_ldap.
  
  (closes issue #16257)
  Reported by: nito
  Patches:
        issue16257_20100111.diff uploaded by seanbright (license 71)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-14 23:18:30 +00:00
Tilghman Lesher
3e039cb60c Merged revisions 240175 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240175 | tilghman | 2010-01-14 11:34:53 -0600 (Thu, 14 Jan 2010) | 2 lines
  
  Similarly, ensure that matchcid is duplicated correctly when merging contexts.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240176 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-14 17:39:02 +00:00
Matthew Nicholson
57a86fe426 Merged revisions 240078 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240078 | mnicholson | 2010-01-14 10:14:35 -0600 (Thu, 14 Jan 2010) | 9 lines
  
  This change fixes a few bugs in the way the far max IFP was calculated that were introduced in r231692.
  
  (closes issue #16497)
  Reported by: globalnetinc
  Patches:
        udptl-max-ifp-fix1.diff uploaded by mnicholson (license 96)
  Tested by: globalnetinc
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240092 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-14 16:19:41 +00:00
Jeff Peeler
32ab9b2bfb Merged revisions 239839 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r239839 | jpeeler | 2010-01-13 13:48:16 -0600 (Wed, 13 Jan 2010) | 18 lines
  
  Merged revisions 239838 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r239838 | jpeeler | 2010-01-13 13:43:33 -0600 (Wed, 13 Jan 2010) | 11 lines
    
    Fix regression for timed out parked call returning to caller
    
    This issue seems to have been exposed by the fix in 160390 whereby using a
    masquerade prevented a crash. The new channel used in the masquerade was
    not copying the macro information from the old channel.
    
    (closes issue #15459)
    Reported by: djrodman
    Patches: 
          patch_15459.txt uploaded by mnick (license )
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@239842 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-13 19:52:36 +00:00
Leif Madsen
212fdb7360 Merged revisions 239834 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r239834 | lmadsen | 2010-01-13 13:31:13 -0600 (Wed, 13 Jan 2010) | 8 lines
  
  Add more examples to extensions.conf showing how to use various
  functionality and provide commonly useful features.
  
  (closes issue #16090)
  Reported by: pprindeville
  Patches:
        extensions.conf-bugid16090.patch#3 uploaded by pprindeville (license 347)
  Tested by: tzafrir, pprindeville, lmadsen
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@239835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-13 19:31:36 +00:00
David Vossel
5a895b019c Merged revisions 239712 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r239712 | dvossel | 2010-01-13 10:31:14 -0600 (Wed, 13 Jan 2010) | 24 lines
  
  add silence gen to wait apps
  
  asterisk.conf's 'transmit_silence' option existed before
  this patch, but was limited to only generating silence
  while recording and sending DTMF.  Now enabling the
  transmit_silence option generates silence during wait
  times as well.
  
  To achieve this, ast_safe_sleep has been modified to
  generate silence anytime no other generators are present
  and transmit_silence is enabled.  Wait apps not using
  ast_safe_sleep now generate silence when transmit_silence
  is enabled as well.
  
  (closes issue #16524)
  Reported by: kobaz
  
  (closes issue #16523)
  Reported by: kobaz
  Tested by: dvossel
  
  Review: https://reviewboard.asterisk.org/r/456/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@239716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-13 16:55:35 +00:00
Tilghman Lesher
c00e8397c3 Merged revisions 239571 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r239571 | tilghman | 2010-01-12 13:58:00 -0600 (Tue, 12 Jan 2010) | 5 lines
  
  Blank callerid and NULL callerid should not compare equal.
  The second is the default state for matching CID in the dialplan (no matching)
  while the first matches one particular CallerID.  This is a regression.
  (fixes AST-314, SWP-611)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@239573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-12 19:59:23 +00:00
Leif Madsen
167d5c57fe Merged revisions 239520 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r239520 | lmadsen | 2010-01-12 12:22:45 -0600 (Tue, 12 Jan 2010) | 6 lines
  
  Note that direct T.38 is not supported.
  
  (closes issue #16411)
  Reported by: stanusr
  Patches:
        __20091210-sip.conf.sample-documentation.txt uploaded by lmadsen (license 10)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@239521 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-12 18:24:38 +00:00
Sean Bright
64bfb52a76 Merged revisions 239473 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r239473 | seanbright | 2010-01-12 12:09:12 -0500 (Tue, 12 Jan 2010) | 10 lines
  
  Fix crash in res_config_ldap.
  
  We need to allocate enough room for 2 pointers, not 2 characters.
  
  (closes issue #16397)
  Reported by: bklang
  Patches:
        res_config_ldap.patch uploaded by applsplatz (license 949)
  Tested by: applsplatz
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@239475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-12 17:14:39 +00:00
David Vossel
ff32d9c886 Merged revisions 239427 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r239427 | dvossel | 2010-01-12 10:14:41 -0600 (Tue, 12 Jan 2010) | 14 lines
  
  fixes text support in sdp answer
  
  The code that handled setting 'm=text' in the sdp was not executing
  in the correct order.  The check to see if text was needed came after
  the check to add 'm=text' to the sdp, this resulted in 'm=text' always
  being set to 0 because it looked like text was never required.
  
  (closes issue #16457)
  Reported by: peterj
  Patches:
        textportinsdp.diff uploaded by peterj (license 951)
        issue16457.diff uploaded by dvossel (license 671)
  Tested by: peterj
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@239447 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-12 16:21:09 +00:00
Tilghman Lesher
8824d3b4f5 Merged revisions 239308 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r239308 | tilghman | 2010-01-11 21:21:40 -0600 (Mon, 11 Jan 2010) | 15 lines
  
  Merged revisions 239307 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r239307 | tilghman | 2010-01-11 21:18:36 -0600 (Mon, 11 Jan 2010) | 8 lines
    
    Portability and other fixes for the safe_asterisk script
    (closes issue #16416)
     Reported by: bklang
     Patches: 
           safe_asterisk-compat-1.patch uploaded by bklang (license 919)
           20100106__issue16416__trunk.diff.txt uploaded by tilghman (license 14)
     Tested by: bklang
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@239309 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-12 03:24:05 +00:00
Tilghman Lesher
ca1aafee27 Merged revisions 238916 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r238916 | tilghman | 2010-01-08 19:08:04 -0600 (Fri, 08 Jan 2010) | 13 lines
  
  Merged revisions 238915 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r238915 | tilghman | 2010-01-08 18:57:58 -0600 (Fri, 08 Jan 2010) | 6 lines
    
    -1 is interpreted as an error, intead of the maximum mask.
    (closes issue #16241)
     Reported by: vnovy
     Patches: 
           manager.c.patch uploaded by vnovy (license 922)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-09 01:27:35 +00:00
Jeff Peeler
6714f4a450 Merged revisions 238835 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r238835 | jpeeler | 2010-01-08 17:30:55 -0600 (Fri, 08 Jan 2010) | 11 lines
  
  Merged revisions 238834 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r238834 | jpeeler | 2010-01-08 17:28:37 -0600 (Fri, 08 Jan 2010) | 4 lines
    
    Stop a crash when no peer is passed to masq_park_call.
    
    (distantly related to issue #16406)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238836 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-08 23:33:17 +00:00
Tilghman Lesher
080d0a2c41 Merged revisions 238754 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r238754 | tilghman | 2010-01-08 16:17:03 -0600 (Fri, 08 Jan 2010) | 7 lines
  
  Initialize variables that we attempt to free later.
  (closes issue #16302)
   Reported by: yahsyn
   Patches: 
         20091124__issue16302.diff.txt uploaded by tilghman (license 14)
   Tested by: yahsyn
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238758 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-08 22:18:00 +00:00
David Vossel
fc530550dd Merged revisions 238635 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r238635 | dvossel | 2010-01-08 13:39:30 -0600 (Fri, 08 Jan 2010) | 22 lines
  
  fixes AUDIOHOOK_INHERIT regression
  
  During the process of removing an audiohook from one channel
  and attaching it to another the audiohook's status is updated
  to DONE and then back to whatever it was previously.  Typically
  updating the status after setting it to DONE is not a good idea
  because DONE can trigger unrecoverable audiohook destruction
  events... because of this a conditional check was added to
  audiohook_update_status to explicitly prevent the audiohook
  from ever changing after being set to DONE.  It was this check
  that prevented audiohook inherit from work properly though.
  
  Now ast_audiohook_move_by_source is treated as a special exception,
  as the audiohook must be returned to its previous status after
  attaching it to the new channel.  This is only a safe operation
  because the audiohook's lock is held the entire time, otherwise
  this could cause trouble.
  
  (closes issue #16522)
  Reported by: corruptor
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-08 19:44:54 +00:00
Matthew Nicholson
78a28e1437 Merged revisions 238630 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r238630 | mnicholson | 2010-01-08 13:32:11 -0600 (Fri, 08 Jan 2010) | 12 lines
  
  Merged revisions 238629 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r238629 | mnicholson | 2010-01-08 13:20:44 -0600 (Fri, 08 Jan 2010) | 5 lines
    
    Properly calculate the remaining space in the output string when reducing format strings.
    
    (closes issue #16560)
    Reported by: goldwein
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238633 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-08 19:34:03 +00:00
Jeff Peeler
2ea5f642ca Blocked revisions 238583 via svnmerge
........
  r238583 | jpeeler | 2010-01-08 11:18:41 -0600 (Fri, 08 Jan 2010) | 5 lines
  
  Stop trying to find a parking space after traversing the parkinglot one time.
  
  (closes issue #16428)
  Reported by: Yasuhiro Konishi
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-08 17:19:02 +00:00
Tilghman Lesher
106a95a542 Merged revisions 209400 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r209400 | kpfleming | 2009-07-28 08:49:46 -0500 (Tue, 28 Jul 2009) | 3 lines
  
  Define side-effect-safe MIN and MAX macros and remove duplicate definitions from various files.
  (closes issue #16251)
  Reported by: asgaroth
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238494 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-07 21:17:03 +00:00
David Vossel
ecca111f59 Merged revisions 238412 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r238412 | dvossel | 2010-01-07 14:15:27 -0600 (Thu, 07 Jan 2010) | 16 lines
  
  Merged revisions 238411 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r238411 | dvossel | 2010-01-07 14:14:25 -0600 (Thu, 07 Jan 2010) | 10 lines
    
    fixes crash in "scheduled_destroy" in chan_iax
    
    A signed short was used to represent a callnumber.  This is makes
    it possible to attempt to access the iaxs array with a negative
    index.
    
    (closes issue #16565)
    Reported by: jensvb
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238441 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-07 20:22:50 +00:00
David Vossel
329f9d8548 Merged revisions 238405 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r238405 | dvossel | 2010-01-07 14:00:31 -0600 (Thu, 07 Jan 2010) | 8 lines
  
  Change in sip show channels display format allowing more digits for CID
  
  (closes issue #16459)
  Reported by: Rzadzins
  Patches:
        chan_sip_longer_cid.patch uploaded by Rzadzins (license 953)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-07 20:03:46 +00:00
David Vossel
9f78b4d23b Merged revisions 238361 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r238361 | dvossel | 2010-01-07 12:58:23 -0600 (Thu, 07 Jan 2010) | 8 lines
  
  cli 'queue show' formatting fix.  queue name was truncated over 12 characters
  
  (closes issue #16078)
  Reported by: RoadKill
  Patches:
        quequename_limit.patch uploaded by ppyy (license 906)
  Tested by: dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-07 19:00:44 +00:00
Tilghman Lesher
a2c3edc2a8 Merged revisions 238231 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r238231 | tilghman | 2010-01-06 15:45:17 -0600 (Wed, 06 Jan 2010) | 11 lines
  
  Merged revisions 238230 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r238230 | tilghman | 2010-01-06 15:41:55 -0600 (Wed, 06 Jan 2010) | 4 lines
    
    Revise documentation on disposition values to the actual values used.
    (closes issue #16289)
     Reported by: wdoekes
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238232 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-06 21:48:32 +00:00
Jeff Peeler
3bd90af396 Merged revisions 238181 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r238181 | jpeeler | 2010-01-06 14:37:18 -0600 (Wed, 06 Jan 2010) | 8 lines
  
  Fix misreverting from 177158.
  
  (closes issue #15725)
  Reported by: shanermn
  Patches: 
        v1-15725.patch uploaded by dimas (license 88)
  Tested by: shanermn
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-06 20:38:28 +00:00
Jeff Peeler
511d94399b Merged revisions 238134 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r238134 | jpeeler | 2010-01-06 13:05:06 -0600 (Wed, 06 Jan 2010) | 10 lines
  
  Fix channel name comparison for bridge application.
  
  The channel name comparison was not comparing the whole string and therefore
  if one channel name was a substring of the other, the bridge would fail.
  
  (closes issue #16528)
  Reported by: telecos82
  Patches: 
        res_features_r236843.diff uploaded by telecos82 (license 687)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238135 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-06 19:07:03 +00:00
Russell Bryant
7222ae2fe2 Merged revisions 238010 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r238010 | russell | 2010-01-06 09:19:10 -0600 (Wed, 06 Jan 2010) | 14 lines
  
  Merged revisions 238009 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r238009 | russell | 2010-01-06 09:18:22 -0600 (Wed, 06 Jan 2010) | 7 lines
    
    Resolve a crash due to an ast_frame not being fully initialized.
    
    (closes issue #16531)
    Reported by: john8675309
    
    (closes SWP-615)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-06 15:20:01 +00:00
Tilghman Lesher
7aa0125b98 Something clearly went wrong with a merge somewhere, because these are all duplicates (and therefore dead code).
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237966 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-06 06:51:36 +00:00
David Vossel
209bef10c0 Merged revisions 237920 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r237920 | dvossel | 2010-01-05 17:08:50 -0600 (Tue, 05 Jan 2010) | 16 lines
  
  fixes holdtime playback issue in app_queue
  
  When reporting hold time, the number of seconds should be mod 60.
  Otherwise audio playback could be something like "2 minutes 123 seconds"
  rather than "2 minutes 3 seconds".
  
  Also, the "minute" sound file is missing, so for the moment until
  that file can be created the "minutes" file is used instead.
  
  (closes issue #16168)
  Reported by: nickilo
  Patches:
        patch-unified-trunk-rev-222176 uploaded by nickilo (license )
  Tested by: nickilo, wonderg
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237923 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-05 23:10:17 +00:00
David Vossel
50512e1bdf Merged revisions 237839 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r237839 | dvossel | 2010-01-05 13:29:47 -0600 (Tue, 05 Jan 2010) | 19 lines
  
  fixes subscriptions being lost after 'module reload'
  
  During a module reload if multiple extension configs are present,
  such as both extensions.conf and extensions.ael, watchers for one
  config's hints will be lost during the merging of the other config.
  
  This happens because hint watchers are only preserved for the
  current config being merged.  The old context list is destroyed
  after the merging takes place, meaning any watchers that were not
  perserved will be removed.
  
  Now all hints are preserved during merging regardless of what config
  file is being merged.  These hints are only restored if they
  are present within the new context list.
  
  (closes issue #16093)
  Reported by: jlaroff
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237843 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-05 19:43:06 +00:00
Russell Bryant
6983477cd7 Merged revisions 237699 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r237699 | russell | 2010-01-05 11:16:01 -0600 (Tue, 05 Jan 2010) | 14 lines
  
  Merged revisions 237697 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r237697 | russell | 2010-01-05 11:13:28 -0600 (Tue, 05 Jan 2010) | 7 lines
    
    Change a NOTICE log message to DEBUG where it belongs.
    
    (closes issue #16479)
    Reported by: alexrecarey
    
    (closes SWP-577)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237712 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-05 17:19:47 +00:00
Michiel van Baak
efe529ef12 Blocked revisions 237656 via svnmerge
........
  r237656 | mvanbaak | 2010-01-05 17:08:12 +0100 (Tue, 05 Jan 2010) | 6 lines
  
  Make CLI command 'mixmonitor start|stop <channel> work again.
  
  (closes issue #16534)
  Reported by: jlaguilar
  Fix as suggested by jlaguilar in the bugreport
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237658 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-05 16:10:15 +00:00
Tilghman Lesher
bda6d0dc8c Merged revisions 237574 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r237574 | tilghman | 2010-01-04 15:48:20 -0600 (Mon, 04 Jan 2010) | 13 lines
  
  Merged revisions 237573 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r237573 | tilghman | 2010-01-04 15:45:46 -0600 (Mon, 04 Jan 2010) | 6 lines
    
    Bounds checking for input string
    (closes issue #16407)
     Reported by: qwell
     Patches: 
           20100104__issue16407.diff.txt uploaded by tilghman (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237575 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-04 21:51:55 +00:00
Tilghman Lesher
371e756c4f Merged revisions 237494 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r237494 | tilghman | 2010-01-04 14:59:01 -0600 (Mon, 04 Jan 2010) | 15 lines
  
  Merged revisions 237493 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r237493 | tilghman | 2010-01-04 14:57:35 -0600 (Mon, 04 Jan 2010) | 8 lines
    
    Regression in issue #15421 - Pattern matching
    (closes issue #16482)
     Reported by: wdoekes
     Patches: 
           astsvn-16482-betterfix.diff uploaded by wdoekes (license 717)
           20091223__issue16482.diff.txt uploaded by tilghman (license 14)
     Tested by: wdoekes, tilghman
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237495 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-04 21:00:29 +00:00
Tilghman Lesher
487e4bb8cd Merged revisions 237414 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r237414 | tilghman | 2010-01-04 13:03:20 -0600 (Mon, 04 Jan 2010) | 2 lines
  
  Oops, didn't compile (thanks, kpfleming)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237415 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-04 19:04:31 +00:00
Tilghman Lesher
4011934fd8 Merged revisions 237410 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r237410 | tilghman | 2010-01-04 12:42:10 -0600 (Mon, 04 Jan 2010) | 7 lines
  
  Further reduce the encoded blank values back to blank in the realtime API.
  (closes issue #16533)
   Reported by: sergee
   Patches: 
         200100104__issue16533.diff.txt uploaded by tilghman (license 14)
   Tested by: sergee
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237411 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-04 18:43:03 +00:00
Tilghman Lesher
900879455b Merged revisions 237406 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r237406 | tilghman | 2010-01-04 12:28:28 -0600 (Mon, 04 Jan 2010) | 23 lines
  
  Merged revisions 237405 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r237405 | tilghman | 2010-01-04 12:19:00 -0600 (Mon, 04 Jan 2010) | 16 lines
    
    Add a flag to disable the Background behavior, for AGI users.
    This is in a section of code that relates to two other issues, namely
    issue #14011 and issue #14940), one of which was the behavior of
    Background when called with a context argument that matched the current
    context.  This fix broke FreePBX, however, in a post-Dial situation.
    Needless to say, this is an extremely difficult collision of several
    different issues.  While the use of an exception flag is ugly, fixing all
    of the issues linked is rather difficult (although if someone would like
    to propose a better solution, we're happy to entertain that suggestion).
    (closes issue #16434)
     Reported by: rickead2000
     Patches: 
           20091217__issue16434.diff.txt uploaded by tilghman (license 14)
           20091222__issue16434__1.6.1.diff.txt uploaded by tilghman (license 14)
     Tested by: rickead2000
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237407 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-04 18:30:36 +00:00
David Vossel
b5724aedef Blocked revisions 237327 via svnmerge
........
  r237327 | dvossel | 2010-01-04 10:39:11 -0600 (Mon, 04 Jan 2010) | 10 lines
  
  app_queue segfaults if realtime field uniqueid is NULL
  
  (closes issue #16385)
  Reported by: haakon
  Patches:
        app_queue.c.patch uploaded by haakon (license 880)
        app_queue.c.patch_v2 uploaded by dvossel (license 671)
  Tested by: haakon
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-04 16:52:02 +00:00
Jeff Peeler
9d65a5cd7a Merged revisions 237323 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r237323 | jpeeler | 2010-01-04 10:24:51 -0600 (Mon, 04 Jan 2010) | 5 lines
  
  Fix timeout for AGI command speech recognize.
  
  (closes issue #16297)
  Reported by: semond
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237324 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-04 16:26:26 +00:00
Tilghman Lesher
4df8feda18 Merged revisions 237319 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r237319 | tilghman | 2010-01-04 10:20:03 -0600 (Mon, 04 Jan 2010) | 10 lines
  
  Merged revisions 237318 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r237318 | tilghman | 2010-01-04 10:18:59 -0600 (Mon, 04 Jan 2010) | 3 lines
    
    It's also possible for the Local channel to directly execute an Application.
    Reviewboard: https://reviewboard.asterisk.org/r/452/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237320 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-04 16:21:27 +00:00
Olle Johansson
80ee9d8731 Merged revisions 237136 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r237136 | oej | 2010-01-02 10:54:22 +0100 (Lör, 02 Jan 2010) | 10 lines

Merged revisions 237135 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r237135 | oej | 2010-01-02 10:52:30 +0100 (Lör, 02 Jan 2010) | 2 lines

Release memory of the contact acl before unloading module

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237137 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-02 09:56:02 +00:00