Commit Graph

18229 Commits

Author SHA1 Message Date
Sean Bright
f369b2b4ee Merged revisions 241938 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r241938 | seanbright | 2010-01-21 10:27:42 -0500 (Thu, 21 Jan 2010) | 12 lines
  
  Merged revisions 241932 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r241932 | seanbright | 2010-01-21 10:25:46 -0500 (Thu, 21 Jan 2010) | 5 lines
    
    Fix configure check for PTHREAD_ONCE_INIT when manually adding -Wall to CFLAGS.
    
    (closes issue #16666)
    Reported by: romain_proformatique
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@241940 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-21 15:31:43 +00:00
Tilghman Lesher
00898ffab7 Merged revisions 241766 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r241766 | tilghman | 2010-01-20 23:54:30 -0600 (Wed, 20 Jan 2010) | 9 lines
  
  Merged revisions 241765 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r241765 | tilghman | 2010-01-20 23:53:17 -0600 (Wed, 20 Jan 2010) | 2 lines
    
    Guard against division by zero.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@241768 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-21 05:56:01 +00:00
David Vossel
62cee6e469 Merged revisions 241714 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r241714 | dvossel | 2010-01-20 15:14:47 -0600 (Wed, 20 Jan 2010) | 10 lines
  
  rtp timestamp to timeval calculation fix
  
  The rtp timestamp to timeval calculation was only
  accurate for 8kHz audio. This patch corrects this.
  
  Review: https://reviewboard.asterisk.org/r/468/
  
  SWP-648
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@241740 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-20 21:22:32 +00:00
David Vossel
11e05a5fd5 Merged revisions 241627 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r241627 | dvossel | 2010-01-20 14:01:07 -0600 (Wed, 20 Jan 2010) | 12 lines
  
  Merged revisions 241626 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r241626 | dvossel | 2010-01-20 14:00:04 -0600 (Wed, 20 Jan 2010) | 6 lines
    
    fixes parsing error in Makefile.
    
    Some echo lines were missing "; . Thanks to jparker for pointing out
    the problem. 
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@241630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-20 20:12:50 +00:00
Alec L Davis
18ce76f288 Update CDR variables as pbx starts
Allows CDR variables added in cdr.c:set_one_cid to become visable during the call,
by executing ast_cdr_update() early in __ast_pbx_run.

Based on cdr_update.diff3.txt

(issue #16638)
Reported by: alecdavis
Patches: 
      cdr_update.diff3.txt uploaded by alecdavis (license 585)
Tested by: alecdavis



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@241456 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-20 09:37:40 +00:00
Jeff Peeler
9c03338402 Merged revisions 241366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r241366 | jpeeler | 2010-01-19 16:59:53 -0600 (Tue, 19 Jan 2010) | 13 lines
  
  Initialize data on the stack so that Park doesn't interpret random arguments.
  
  passdata was only being set in pbx_substitue_variables when arguments were
  passed.
  
  (closes issue #16406)
  (closes issue #16586)
  Reported by: DLNoah
  Patches: 
        bug16586v2.patch uploaded by jpeeler (license 325)
  Tested by: DLNoah
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@241368 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-19 23:01:44 +00:00
Jeff Peeler
e21ca8651a Merged revisions 241314 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r241314 | jpeeler | 2010-01-19 12:46:11 -0600 (Tue, 19 Jan 2010) | 20 lines
  
  Merged revisions 241227 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r241227 | jpeeler | 2010-01-19 11:22:18 -0600 (Tue, 19 Jan 2010) | 13 lines
    
    Fix deadlock in agent_read by removing call to agent_logoff.
    
    One must always lock the agents list lock before the agent private. agent_read
    locks the private immediately, so locking the agents list lock is not an
    option (which is what agent_logoff requires). Because agent_read already 
    has access to the agent private all that is necessary is to do the required
    hanging up that agent_logoff performed.
    
    (closes issue #16321)
    Reported by: valon24
    Patches: 
          bug16321.patch uploaded by jpeeler (license 325)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@241317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-19 19:01:09 +00:00
Jason Parker
b36efa71bf 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.1@241232 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-19 17:43:10 +00:00
Jason Parker
269e71bb24 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.1@241100 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-18 22:05:37 +00:00
Sean Bright
c319632d70 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.1@241018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-18 20:01:48 +00:00
David Vossel
9917b29d24 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.1@240889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-18 16:46:21 +00:00
David Vossel
1cd2a5b0e6 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.1@240844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-18 15:53:55 +00:00
Sean Bright
0bcfc1587a 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.1@240719 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-17 19:47:45 +00:00
Sean Bright
0758e620c9 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.1@240669 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-16 00:59:24 +00:00
Russell Bryant
87498f1b29 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.1@240550 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-15 23:07:20 +00:00
Tilghman Lesher
19a0215e43 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.1@240502 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-15 21:44:41 +00:00
Tilghman Lesher
e0abd47c70 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.1@240417 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-15 20:57:07 +00:00
Russell Bryant
dd0774a82b Merged revisions 240411 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240411 | russell | 2010-01-15 14:41:11 -0600 (Fri, 15 Jan 2010) | 7 lines
  
  Ensure payload type is properly checked when comparing against cached events.
  
  (closes issue #16607)
  Reported by: ddv2005
  Patches:
        event.patch uploaded by ddv2005 (license 769)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@240412 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-15 20:43:32 +00:00
Sean Bright
9a48f50452 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.1@240279 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-14 23:18:34 +00:00
Tilghman Lesher
e51a0acddc 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.1@240177 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-14 17:39:37 +00:00
Tilghman Lesher
2a261612cd Merged revisions 240129 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240129 | tilghman | 2010-01-14 10:52:22 -0600 (Thu, 14 Jan 2010) | 4 lines
  
  Ensure that the callerid is NULL when the parent is effectively NULL.
  This applies only to pattern-match hints, which create exact-match
  hints on the fly.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@240131 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-14 16:56:29 +00:00
Matthew Nicholson
058df086d3 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.1@240089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-14 16:19:14 +00:00
Jeff Peeler
7e70911f96 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.1@239841 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-13 19:52:08 +00:00
Leif Madsen
27f5939d6d 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.1@239836 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-13 19:31:52 +00:00
David Vossel
db7380ffcd 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.1@239714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-13 16:38:31 +00:00
Olle Johansson
782a0923af Show proper stats in "sip show channelstats"
(closes issue #15819)
Reported by: klaus3000
Patches: 
      asterisk-sip-show-channelstats-1.6.1.txt uploaded by klaus3000 (license 65)
Tested by: klaus3000, oej


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@239706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-13 11:37:56 +00:00
Olle Johansson
250e173406 Merged revisions 239665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r239665 | oej | 2010-01-13 11:45:19 +0100 (Ons, 13 Jan 2010) | 2 lines

MAX() moved to utils.h

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@239676 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-13 11:19:17 +00:00
Tilghman Lesher
be950a26d2 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.1@239574 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-12 20:00:53 +00:00
Leif Madsen
2bf66584ca 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.1@239522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-12 18:25:16 +00:00
Sean Bright
b4a18d862b 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.1@239476 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-12 17:14:41 +00:00
David Vossel
ba67e3a68e 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.1@239440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-12 16:19:36 +00:00
Tilghman Lesher
31f7c8e937 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.1@239310 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-12 03:25:11 +00:00
Tilghman Lesher
b5dada66bf 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.1@238983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-09 01:30:38 +00:00
Jeff Peeler
5dcfc56b56 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.1@238837 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-08 23:33:56 +00:00
Tilghman Lesher
3ad89edcaf 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.1@238763 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-08 22:18:40 +00:00
David Vossel
16203af95e 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.1@238638 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-08 19:44:28 +00:00
Matthew Nicholson
cb7a1256d5 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.1@238631 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-08 19:33:53 +00:00
Jeff Peeler
dfdd7c10d0 Merged revisions 238583 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  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.1@238585 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-08 17:19:37 +00:00
Tilghman Lesher
b02f13e22a 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.1@238497 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-07 21:17:32 +00:00
David Vossel
42d6b8e5f6 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.1@238430 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-07 20:20:38 +00:00
David Vossel
07a0c7cd89 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.1@238407 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-07 20:01:42 +00:00
David Vossel
5b81279939 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.1@238363 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-07 19:00:16 +00:00
Tzafrir Cohen
ec6d1db5e9 Merged revisions 238313 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r238313 | tzafrir | 2010-01-07 11:14:57 +0200 (ה', 07 ינו 2010) | 2 lines
  
  Document the usefulness of explicit udp:// in the register string
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@238351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-07 12:09:55 +00:00
Tilghman Lesher
ec66b6d4e1 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.1@238233 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-06 21:48:40 +00:00
Jeff Peeler
5a2396e446 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.1@238183 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-06 20:39:26 +00:00
Jeff Peeler
d296e58fac 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.1@238136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-06 19:08:30 +00:00
Russell Bryant
2ee78bf6e6 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.1@238012 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-06 15:21:29 +00:00
Tilghman Lesher
5264340224 One duplicate setting here (dead code).
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@237967 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-06 06:52:12 +00:00
David Vossel
119687d05e 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.1@237922 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-05 23:09:55 +00:00
David Vossel
8278395dc8 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.1@237841 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-05 19:31:43 +00:00