Commit Graph

18421 Commits

Author SHA1 Message Date
Jason Parker
25728aac04 Merged revisions 260802 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r260802 | qwell | 2010-05-04 10:49:57 -0500 (Tue, 04 May 2010) | 9 lines
  
  Merged revisions 260801 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r260801 | qwell | 2010-05-04 10:49:27 -0500 (Tue, 04 May 2010) | 1 line
    
    Fix fallout from removing  from configure script.  Pointed out by philipp64 on #asterisk-dev
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@260804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-04 15:51:11 +00:00
Jason Parker
a095bdc3b5 Fix merge props
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@260745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-03 17:49:52 +00:00
Paul Belanger
811de1769e Merged revisions 260661-260662 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r260661 | pabelanger | 2010-05-03 12:41:30 -0400 (Mon, 03 May 2010) | 10 lines
  
  non-root make install PREFIX=/tmp fails.
  Prepend libdir when executing mkpkgconfig allowing non-root installs to work.
  
  (closes issue #17268)
  Reported by: pabelanger
  Patches:
        issue17268.patch uploaded by pabelanger (license 224)
  Tested by: pabelanger
........
  r260662 | pabelanger | 2010-05-03 12:54:41 -0400 (Mon, 03 May 2010) | 3 lines
  
  Should have removed /usr/lib/ part. Thanks Qwell.
........



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@260741 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-03 17:37:13 +00:00
Leif Madsen
f47cb66883 Merged revisions 260570 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r260570 | lmadsen | 2010-05-03 09:58:23 -0500 (Mon, 03 May 2010) | 9 lines
  
  Merged revisions 260569 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r260569 | lmadsen | 2010-05-03 09:57:39 -0500 (Mon, 03 May 2010) | 1 line
    
    Minor typo pointed out by pabelanger on IRC.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@260572 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-05-03 14:59:32 +00:00
Jeff Peeler
739b5b74a1 Merged revisions 260437 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r260437 | jpeeler | 2010-04-30 17:36:49 -0500 (Fri, 30 Apr 2010) | 18 lines
  
  Merged revisions 260434 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r260434 | jpeeler | 2010-04-30 17:22:46 -0500 (Fri, 30 Apr 2010) | 11 lines
    
    Ensure channel state is not incorrectly set in the case of a very early answer.
    
    The needringing bit was being read in dahdi_read after answering thereby
    setting the state to ringing from up. This clears needringing upon answering
    so that is no longer possible.
    
    (closes issue #17067)
    Reported by: tzafrir
    Patches: 
          needringing.diff uploaded by tzafrir (license 46)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@260440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-30 22:47:26 +00:00
Mark Michelson
dc515bc8ac Merged revisions 260346 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r260346 | mmichelson | 2010-04-30 15:11:02 -0500 (Fri, 30 Apr 2010) | 24 lines
  
  Merged revisions 260345 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r260345 | mmichelson | 2010-04-30 15:08:15 -0500 (Fri, 30 Apr 2010) | 18 lines
    
    Fix potential crash from race condition due to accessing channel data without the channel locked.
    
    In res_musiconhold.c, there are several places where a channel's
    stream's existence is checked prior to calling ast_closestream on it. The issue
    here is that in several cases, the channel was not locked while checking the
    stream. The result was that if two threads checked the state of the channel's
    stream at approximately the same time, then there could be a situation where
    both threads attempt to call ast_closestream on the channel's stream. The result
    here is that the refcount for the stream would go below 0, resulting in a crash.
    
    I have added proper channel locking to res_musiconhold.c to ensure that
    we do not try to check chan->stream without the channel locked. A Digium customer
    has been using this patch for several weeks and has not had any crashes since
    applying the patch.
    
    ABE-2147
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@260354 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-30 20:18:31 +00:00
Richard Mudgett
7f0a35d123 Merged revisions 260231 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r260231 | rmudgett | 2010-04-29 17:44:14 -0500 (Thu, 29 Apr 2010) | 33 lines
  
  Merged revisions 260195 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r260195 | rmudgett | 2010-04-29 17:11:47 -0500 (Thu, 29 Apr 2010) | 26 lines
    
    DTMF CallerID detection problems.
    
    The code handling DTMF CallerID drops digits on long CallerID numbers and
    may timeout waiting for the first ring with shorter numbers.
    
    The DTMF emulation mode was not turned off when processing DTMF CallerID.
    When the emulation code gets behind in processing the DTMF digits it can
    skip a digit.
    
    For shorter numbers, the timeout may have been too short.  I increased it
    from 2 seconds to 4 seconds.  Four seconds is a typical time between rings
    for many countries.
    
    (closes issue #16460)
    Reported by: sum
    Patches:
          issue16460.patch uploaded by rmudgett (license 664)
          issue16460_v1.6.2.patch uploaded by rmudgett (license 664)
    Tested by: sum, rmudgett
    
    Review: https://reviewboard.asterisk.org/r/634/
    
    JIRA SWP-562
    JIRA AST-334
    JIRA SWP-901
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@260233 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-29 23:03:27 +00:00
Tilghman Lesher
f231248b4e Merged revisions 260148 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r260148 | tilghman | 2010-04-29 13:15:57 -0500 (Thu, 29 Apr 2010) | 2 lines
  
  Pattern match fail.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@260154 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-29 18:18:05 +00:00
David Vossel
57082e479b Merged revisions 260050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r260050 | dvossel | 2010-04-29 10:33:27 -0500 (Thu, 29 Apr 2010) | 21 lines
  
  Merged revisions 260049 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r260049 | dvossel | 2010-04-29 10:31:02 -0500 (Thu, 29 Apr 2010) | 14 lines
    
    Fixes crash in audiohook_write_list
    
    The middle_frame in the audiohook_write_list function was
    being freed if a audiohook manipulator returned a failure.
    This is incorrect logic.  This patch resolves this and
    adds detailed descriptions of how this function should work
    and why manipulator failures must be ignored.
    
    (closes issue #17052)
    Reported by: dvossel
    Tested by: dvossel

    (closes issue #16196)
    Reported by: atis
    
    Review: https://reviewboard.asterisk.org/r/623/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@260052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-29 15:37:15 +00:00
Mark Michelson
3838cb33b7 Merged revisions 259957 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r259957 | mmichelson | 2010-04-28 17:34:15 -0500 (Wed, 28 Apr 2010) | 11 lines
  
  Don't override peer context with domain context.
  
  (closes issue #17040)
  Reported by: pprindeville
  Patches:
        asterisk-1.6-bugid17040.patch uploaded by pprindeville (license 347)
  Tested by: pprindeville
  
  Review: https://reviewboard.asterisk.org/r/565/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-28 22:35:29 +00:00
David Vossel
df0f9b43ff Merged revisions 259870 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259870 | dvossel | 2010-04-28 16:20:03 -0500 (Wed, 28 Apr 2010) | 39 lines
  
  Merged revisions 259858 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259858 | dvossel | 2010-04-28 16:16:03 -0500 (Wed, 28 Apr 2010) | 33 lines
    
    resolves deadlocks in chan_local
    
    Issue_1.
    In the local_hangup() 3 locks must be held at the same time... pvt, pvt->chan,
    and pvt->owner.  Proper deadlock avoidance is done when the channel to hangup
    is the outbound chan_local channel, but when it is not the outbound channel we
    have an issue... We attempt to do deadlock avoidance only on the tech pvt, when
    both the tech pvt and the pvt->owner are locked coming into that loop.  By
    never giving up the pvt->owner channel deadlock avoidance is not entirely possible.
    This patch resolves that by doing deadlock avoidance on both the pvt->owner and the pvt
    when trying to get the pvt->chan lock.
    
    Issue_2.
    ast_prod() is used in ast_activate_generator() to queue a frame on the channel
    and make the channel's read function get called.  This function is used in
    ast_activate_generator() while the channel is locked, which mean's the channel
    will have a lock both from the generator code and the frame_queue code by the
    time it gets to chan_local.c's local_queue_frame code... local_queue_frame
    contains some of the same crazy deadlock avoidance that local_hangup requires,
    and this recursive lock prevents that deadlock avoidance from happening correctly.
    This patch removes ast_prod() from the channel lock so only one lock is held during
    the local_queue_frame function.
    
    (closes issue #17185)
    Reported by: schmoozecom
    Patches:
          issue_17185_v1.diff uploaded by dvossel (license 671)
          issue_17185_v2.diff uploaded by dvossel (license 671)
    Tested by: schmoozecom, GameGamer43
    
    Review: https://reviewboard.asterisk.org/r/631/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259930 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-28 21:33:16 +00:00
Leif Madsen
8565df022f Merged revisions 259853 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259853 | lmadsen | 2010-04-28 16:08:34 -0500 (Wed, 28 Apr 2010) | 14 lines
  
  Merged revisions 259852 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259852 | lmadsen | 2010-04-28 16:07:48 -0500 (Wed, 28 Apr 2010) | 6 lines
    
    Update config.guess.
    
    Updating config.guess because after installing Ubuntu Server 9.10 and
    running all the update scripts, running ./configure would not continue
    because it was unable to determine what kind of system I had. After
    updating config.guess things started working again.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-28 21:09:37 +00:00
Jason Parker
88ba063f7e Merged revisions 259848 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259848 | qwell | 2010-04-28 15:32:14 -0500 (Wed, 28 Apr 2010) | 9 lines
  
  Merged revisions 259847 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259847 | qwell | 2010-04-28 15:30:21 -0500 (Wed, 28 Apr 2010) | 1 line
    
    Add AC_CONFIG_AUX_DIR to configure script, so systems without install can use install-sh from our source dir.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-28 20:33:41 +00:00
Jason Parker
00872e4ed2 Merged revisions 259837 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259837 | qwell | 2010-04-28 15:26:35 -0500 (Wed, 28 Apr 2010) | 9 lines
  
  Merged revisions 259833 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259833 | qwell | 2010-04-28 15:25:36 -0500 (Wed, 28 Apr 2010) | 1 line
    
    Missed this when removing $ID
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259843 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-28 20:27:38 +00:00
Jason Parker
57a553c562 Merged revisions 259760 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259760 | qwell | 2010-04-28 14:19:54 -0500 (Wed, 28 Apr 2010) | 14 lines
  
  Merged revisions 259748 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259748 | qwell | 2010-04-28 14:17:38 -0500 (Wed, 28 Apr 2010) | 7 lines
    
    Remove usage of `id` since it isn't useful and was causing breakge.
    
    Solaris `id` doesn't support the -u argument.  Instead of figuring out how to
    fix this to work on Solaris, I decided to check why it was necessary and where
    else it was used.  It was only used in one place, and it hasn't been needed
    for a very long time (I question whether it was ever needed).
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-28 19:22:51 +00:00
Jeff Peeler
6505011149 Merged revisions 259672 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259672 | jpeeler | 2010-04-28 12:18:43 -0500 (Wed, 28 Apr 2010) | 11 lines
  
  Merged revisions 259664 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259664 | jpeeler | 2010-04-28 12:13:29 -0500 (Wed, 28 Apr 2010) | 4 lines
    
    Do not play goodbye prompt after timeout of message review.
    
    ABE-2124
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259679 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-28 17:19:37 +00:00
Richard Mudgett
28bf868fb3 Merged revisions 259538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259538 | rmudgett | 2010-04-27 17:18:09 -0500 (Tue, 27 Apr 2010) | 18 lines
  
  Merged revisions 259531 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259531 | rmudgett | 2010-04-27 16:53:07 -0500 (Tue, 27 Apr 2010) | 11 lines
    
    DAHDI "WARNING" message is confusing and vague
    
    "WARNING[28406]: chan_dahdi.c:6873 ss_thread: CallerID feed failed: Success"
    
    Changed the warning to "Failed to decode CallerID on channel 'name'".  The
    message before it is likely more specific about why the CallerID decode
    failed.
    
    SWP-501
    AST-283
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-27 22:37:40 +00:00
Leif Madsen
41250af392 Merged revisions 259527 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259527 | lmadsen | 2010-04-27 16:49:36 -0500 (Tue, 27 Apr 2010) | 23 lines
  
  Merged revisions 259526 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259526 | lmadsen | 2010-04-27 16:48:47 -0500 (Tue, 27 Apr 2010) | 15 lines
    
    Update sounds files.
    
    * Add additional sounds prompts for say_enumeration
    * Update the English conference sounds prompts so they are better
      quality and all sound more consistent
    * Clean up the core-sounds-XX.txt and extra-sounds-XX.txt files to
      include all present sound files
    
    Both core (en, fr, es) and extra (en, fr) sounds files have been updated.
    
    (closes issue #16200)
    Reported by: murf
    
    (closes issue #17137)
    Reported by: lmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-27 21:50:45 +00:00
Jason Parker
39f38de51e Merged revisions 259439 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r259439 | qwell | 2010-04-27 16:13:01 -0500 (Tue, 27 Apr 2010) | 5 lines
  
  Add gar to the check for AR for those silly OSes (Solaris) that don't have ar.
  
  autoconf2.13 couldn't handle AC_PROG_GREP, so I removed it.  This is fine,
  since we don't need to use anything that the configure script doesn't.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-27 21:22:59 +00:00
Jason Parker
18f52fa011 Merged revisions 259353 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259353 | qwell | 2010-04-27 14:31:55 -0500 (Tue, 27 Apr 2010) | 12 lines
  
  Merged revisions 259352 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259352 | qwell | 2010-04-27 14:29:26 -0500 (Tue, 27 Apr 2010) | 5 lines
    
    Support the silly OSes that don't have ar and strip.
    
    Since AC_PATH_TOOL is equiv to AC_CHECK_TOOL when path isn't specified, and
    AC_PATH_TOOLS doesn't exist, we'll just switch to AC_CHECK_TOOLS.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-27 19:35:20 +00:00
Richard Mudgett
6d5289cc13 Merged revisions 259307 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259307 | rmudgett | 2010-04-27 13:29:33 -0500 (Tue, 27 Apr 2010) | 21 lines
  
  Merged revisions 259270 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259270 | rmudgett | 2010-04-27 13:14:54 -0500 (Tue, 27 Apr 2010) | 14 lines
    
    hidecalleridname parameter in chan_dahdi.conf
    
    Issue #7321 implements a new chan_dahdi configuration option.  However, a
    change mentioned in the issue was never implemented.  This is the change
    that will allow the feature to work.
    
    I added a note to chan_dahdi.conf.sample about the feature.
    
    (closes issue #17143)
    Reported by: djensen99
    Patches:
          diff.txt uploaded by djensen99 (license NA) (One line change)
    Tested by: djensen99
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259309 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-27 18:53:17 +00:00
Mark Michelson
d7237250da Merged revisions 259105 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259105 | mmichelson | 2010-04-26 16:45:13 -0500 (Mon, 26 Apr 2010) | 9 lines
  
  Merged revisions 259104 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259104 | mmichelson | 2010-04-26 16:44:43 -0500 (Mon, 26 Apr 2010) | 3 lines
    
    Let compilation succeed warning-free when DONT_OPTIMIZE is turned off.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259108 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-26 21:48:08 +00:00
Mark Michelson
46ebaf9219 Merged revisions 259023 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r259023 | mmichelson | 2010-04-26 16:13:35 -0500 (Mon, 26 Apr 2010) | 19 lines
  
  Merged revisions 259018 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259018 | mmichelson | 2010-04-26 16:03:08 -0500 (Mon, 26 Apr 2010) | 13 lines
    
    Prevent Newchannel manager events for dummy channels.
    
    No Newchannel manager event will be fired for channels that are
    allocated to not match a registered technology type. Thus bogus
    channels allocated solely for variable substitution or CDR
    operations do not result in a Newchannel event.
    
    (closes issue #16957)
    Reported by: atis
    
    Review: https://reviewboard.asterisk.org/r/601
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259078 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-26 21:28:29 +00:00
Tilghman Lesher
145e2a7359 Merged revisions 258776 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r258776 | tilghman | 2010-04-25 13:12:14 -0500 (Sun, 25 Apr 2010) | 13 lines
  
  Merged revisions 258775 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r258775 | tilghman | 2010-04-25 13:09:05 -0500 (Sun, 25 Apr 2010) | 6 lines
    
    When StopMonitor is called, ensure that it will not be restarted by a channel event.
    (closes issue #16590)
     Reported by: kkm
     Patches: 
           resmonitor-16590-trunk.239289.diff uploaded by kkm (license 888)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@258778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-25 18:14:09 +00:00
Matthew Nicholson
85edb0cd54 Merged revisions 258671,258675 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r258671 | mnicholson | 2010-04-22 16:57:59 -0500 (Thu, 22 Apr 2010) | 32 lines
  
  Merged revisions 193391,258670 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r193391 | mnicholson | 2009-05-08 16:01:25 -0500 (Fri, 08 May 2009) | 8 lines
    
    Set the proper disposition on originated calls.
    
    (closes issue #14167)
    Reported by: jpt
    Patches:
          call-file-missing-cdr2.diff uploaded by mnicholson (license 96)
    Tested by: dlotina, rmartinez, mnicholson
  ........
    r258670 | mnicholson | 2010-04-22 16:49:07 -0500 (Thu, 22 Apr 2010) | 11 lines
    
    Fix broken CDR behavior.
    
    This change allows a CDR record previously marked with disposition ANSWERED to be set as BUSY or NO ANSWER.
    
    Additionally this change partially reverts r235635 and does not set the AST_CDR_FLAG_ORIGINATED flag on CDRs generated from ast_call().  To preserve proper CDR behavior, the AST_CDR_FLAG_DIALED flag is now cleared from all brige CDRs in ast_bridge_call().
    
    (closes issue #16797)
    Reported by: VarnishedOtter
    Tested by: mnicholson
  ........
  
  (closes issue #16222)
  Reported by: telles
  Tested by: mnicholson
................
  r258675 | mnicholson | 2010-04-22 17:11:23 -0500 (Thu, 22 Apr 2010) | 2 lines
  
  Fix previous commit.
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@258705 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-22 22:24:09 +00:00
Jeff Peeler
8448c7b538 Merged revisions 258433 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r258433 | jpeeler | 2010-04-21 16:56:09 -0500 (Wed, 21 Apr 2010) | 15 lines
  
  Merged revisions 258432 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r258432 | jpeeler | 2010-04-21 16:45:36 -0500 (Wed, 21 Apr 2010) | 8 lines
    
    Fix looping forever when no input received in certain voicemail menu scenarios.
    
    Specifically, prompting for an extension (when leaving or forwarding a message)
    or when prompting for a digit (when saving a message or changing folders).
    
    ABE-2122
    SWP-1268
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@258435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-21 22:10:56 +00:00
David Vossel
9616cb60c2 Merged revisions 258305 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r258305 | dvossel | 2010-04-21 13:13:36 -0500 (Wed, 21 Apr 2010) | 12 lines
  
  fixes issue with double "sip:" in header field
  
  This is a clear mistake in logic.  Future discussions
  about how to avoid having to handle uri's like this
  should take place in the future, but this fix needs
  to go in for now.
  
  (closes issue #15847)
  Reported by: ebroad
  Patches:
        doublesip.patch uploaded by ebroad (license 878)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@258334 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-21 18:23:47 +00:00
Jeff Peeler
bb0b64d842 Merged revisions 258065 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r258065 | jpeeler | 2010-04-20 12:06:19 -0500 (Tue, 20 Apr 2010) | 17 lines
  
  Merged revisions 258029 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r258029 | jpeeler | 2010-04-20 11:16:33 -0500 (Tue, 20 Apr 2010) | 11 lines
    
    Play correct prompt when voicemail store failure occurs after attempted forward.
    
    If a user's mailbox was full and a message was attempted to be forwarded to
    said box, warnings on the console would indicate failure. However, the played
    prompt was that of success (vm-msgsaved). Now storage failure is taken into
    account and the correct prompt (vm-mailboxfull) is played when appropriate.
    
    ABE-2123
    SWP-1262
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@258105 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-20 17:51:35 +00:00
Terry Wilson
1ad161041b Merged revisions 257810 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r257810 | twilson | 2010-04-19 12:57:41 -0500 (Mon, 19 Apr 2010) | 5 lines
  
  Fix incomplete CDR merge from r195881
  
  Because res/res_features.c was removed and main/cdr.c added, these changes
  didn't make it to trunk and the 1.6.x branches
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257833 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-19 18:22:24 +00:00
Tilghman Lesher
2ea15c9ac6 Merged revisions 257768 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r257768 | tilghman | 2010-04-18 12:25:53 -0500 (Sun, 18 Apr 2010) | 2 lines
  
  Removing unused configuration parameters
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257770 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-18 17:28:07 +00:00
Dwayne M. Hubbard
2133abae5b Merged revisions 257713 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r257713 | dhubbard | 2010-04-16 16:22:30 -0500 (Fri, 16 Apr 2010) | 28 lines
  
  Merged revisions 257686 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r257686 | dhubbard | 2010-04-16 16:15:43 -0500 (Fri, 16 Apr 2010) | 21 lines
    
    Make the mixmonitor thread process audio frames faster
    
    Mantis issue 17078 reports MixMonitor recordings have shorter durations than 
    the call duration.  This was because the mixmonitor thread was not processing 
    frames from the audiohook fast enough.  The mixmonitor thread would slowly fall 
    behind the most recent audio frame and when the channel hangs up, the mixmonitor 
    thread would exit without processing the same number of frames as the channel; 
    leaving the mixmonitor recording shorter than actual call duration.
    
    This revision fixes this issue by moving the ast_audiohook_trigger_wait() and 
    the subsequent audiohook.status check into the block where the 
    ast_audiohook_read_frame() function returns NULL.
    
    (closes issue #17078)
    Reported by: geoff2010
    Patches:
          dw-M17078.patch uploaded by dhubbard (license 733)
    Tested by: dhubbard, geoff2010
    
    Review: https://reviewboard.asterisk.org/r/611/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257739 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-16 21:32:31 +00:00
Dwayne M. Hubbard
e6524551e0 Blocked revisions 257642 via svnmerge
........
  r257642 | dhubbard | 2010-04-16 14:25:30 -0500 (Fri, 16 Apr 2010) | 14 lines
  
  Enable PRI SERVICE message support in chan_dahdi for the 'national' switchtype
  
  Revision 1072 of libpri added SERVICE message support for the 'national' 
  switchtype. The attached patch enables the use of 'pri service' CLI commands 
  on dahdi channels that are configured for the 'national' switchtype.
  
  (closes issue #17142)
  Reported by: dhubbard
  Patches:
        dw-ni2.patch uploaded by dhubbard (license 733)
  Tested by: elguero, dhubbard
  
  Review: https://reviewboard.asterisk.org/r/612/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257645 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-16 19:48:06 +00:00
Tilghman Lesher
2002c3e85a Merged revisions 257560 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r257560 | tilghman | 2010-04-15 16:26:19 -0500 (Thu, 15 Apr 2010) | 13 lines
  
  Merged revisions 257544 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r257544 | tilghman | 2010-04-15 16:23:24 -0500 (Thu, 15 Apr 2010) | 6 lines
    
    Allow application options with arguments to contain parentheses, through a variety of escaping techniques.
    
    Fixes SWP-1194 (ABE-2143).
    
    Review: https://reviewboard.asterisk.org/r/604/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257594 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-15 21:33:23 +00:00
Tilghman Lesher
63bfc46270 Merged revisions 257493 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r257493 | tilghman | 2010-04-15 15:30:15 -0500 (Thu, 15 Apr 2010) | 20 lines
  
  Merged revisions 257467 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r257467 | tilghman | 2010-04-15 15:24:50 -0500 (Thu, 15 Apr 2010) | 13 lines
    
    Don't recreate peer, when responding to a repeated deregistration attempt.
    
    When a reply to a deregistration is lost in transmit, the client retries the
    deregistration.  Previously, this would cause a realtime/autocreate peer to be
    loaded back into memory, after it had already been correctly purged.  Instead,
    we just want to resend the reply without loading the peer.
    
    (closes issue #16908)
     Reported by: kkm
     Patches: 
           20100412__issue16908.diff.txt uploaded by tilghman (license 14)
     Tested by: kkm
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257508 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-15 20:34:36 +00:00
Leif Madsen
00163fa1c1 Merged revisions 257427 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r257427 | lmadsen | 2010-04-15 14:41:05 -0500 (Thu, 15 Apr 2010) | 21 lines
  
  Merged revisions 257426 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r257426 | lmadsen | 2010-04-15 14:40:33 -0500 (Thu, 15 Apr 2010) | 13 lines
    
    Update backtrace.txt documentation.
    
    Update the backtrace.txt documentation so it conforms to the same layout as
    other documents we've been working on recently. Additionally, add a bunch of
    new information about gathering backtraces for crashes and deadlocks, along
    with ways of verifying your file before uploading it. Create a couple of one
    line commands for people to generate the files we need.
    
    (closes issue #17190)
    Reported by: lmadsen
    Patches: 
          backtrace.txt.patch-2 uploaded by lmadsen (license 10)
    Tested by: lmadsen, pabelanger
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257429 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-15 19:43:17 +00:00
Leif Madsen
a8c46a05c9 Merged revisions 257343 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r257343 | lmadsen | 2010-04-15 08:44:38 -0500 (Thu, 15 Apr 2010) | 9 lines
  
  Merged revisions 257342 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r257342 | lmadsen | 2010-04-15 08:41:45 -0500 (Thu, 15 Apr 2010) | 1 line
    
    Update address of the bug tracker.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257345 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-15 13:46:41 +00:00
Tilghman Lesher
ab4cb6e425 Merged revisions 257262 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r257262 | tilghman | 2010-04-14 17:57:35 -0500 (Wed, 14 Apr 2010) | 15 lines
  
  Yet another issue where the conversion of the application delimiter to comma caused an issue.
  
  Application arguments within the feature map could possibly contain a comma,
  which conflicts with the syntax of the features.conf configuration file.  This
  patch allows the argument to be wrapped in parentheses or quoted, to allow the
  application arguments to be interpreted as a single configuration parameter.
  
  (closes issue #16646)
   Reported by: pinga-fogo
   Patches: 
         20100414__issue16646.diff.txt uploaded by tilghman (license 14)
   Tested by: tilghman
   
  Review: https://reviewboard.asterisk.org/r/547/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257264 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-14 23:00:07 +00:00
Matthew Nicholson
a58fd30392 Merged revisions 257146 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r257146 | mnicholson | 2010-04-13 13:10:30 -0500 (Tue, 13 Apr 2010) | 16 lines
  
  Merged revisions 257070 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r257070 | mnicholson | 2010-04-13 11:46:30 -0500 (Tue, 13 Apr 2010) | 9 lines
    
    Add an option to restore past broken behavor of the Events manager action
    
    Before r238915, certain values for the EventMask parameter of the Events action would result in no response being returned.  This patch adds an option to restore that broken behavior.  Also while fixing this bug I discovered that passing an empty EventMasks parameter would also result in no response being returned, this has been fixed as well while being preserved when the broken behavior is requested.
    
    (closes issue #17023)
    Reported by: nblasgen
    
    Review: https://reviewboard.asterisk.org/r/602/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257214 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-13 19:30:48 +00:00
Tilghman Lesher
1d80802e6c Merged revisions 257191 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r257191 | tilghman | 2010-04-13 14:17:48 -0500 (Tue, 13 Apr 2010) | 10 lines
  
  Also unref the pvt when we delete the provisional keepalive job.
  
  (closes issue #16774)
   Reported by: kowalma
   Patches: 
         20100315__issue16774.diff.txt uploaded by tilghman (license 14)
   Tested by: falves11, jamicque
  
  Review: https://reviewboard.asterisk.org/r/591/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-13 19:20:50 +00:00
Tilghman Lesher
6943594a1e Merged revisions 257065 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r257065 | tilghman | 2010-04-13 11:33:21 -0500 (Tue, 13 Apr 2010) | 8 lines
  
  Ensure that we can have commas within cdr values.
  
  (closes issue #17001)
   Reported by: snuffy
   Patches: 
         20100412__issue17001.diff.txt uploaded by tilghman (license 14)
   Tested by: snuffy
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257067 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-13 16:38:32 +00:00
Leif Madsen
712bb53ea1 Merged revisions 256901 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r256901 | lmadsen | 2010-04-12 12:29:53 -0500 (Mon, 12 Apr 2010) | 23 lines
  
  Merged revisions 256900 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r256900 | lmadsen | 2010-04-12 12:29:26 -0500 (Mon, 12 Apr 2010) | 15 lines
    
    Add How-To document on collecting debugging info for issues.asterisk.org
    
    Paul Belanger has been helping a lot with bug tracking recently and created
    this document that we can now point to when additional debugging information
    is required. This document will help those filing issues to know how to get
    the information required when filing their issues. This will make things
    easier on the developers.
    
    Initial text and changes by pabelanger. Tweaks and editing by myself.
    
    (closes issue #17159)
    Reported by: pabelanger
    Patches: 
          HOWTO_collect_debug_information.txt.patch uploaded by lmadsen (license 10)
    Tested by: tzafrir, pabelanger, lmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@256903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-12 17:31:01 +00:00
Tilghman Lesher
be3fb80ab6 Merged revisions 256370 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r256370 | tilghman | 2010-04-06 14:28:42 -0500 (Tue, 06 Apr 2010) | 2 lines
  
  Mac OS X does not support comparing a mutex to its initializer.  Create a test for this.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@256372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-06 19:40:13 +00:00
Richard Mudgett
bfac2aeeff Fix malformed if test. Regression of issue 15883.
Converted if statement to a switch statement for clarity.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@256365 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-06 18:08:32 +00:00
Richard Mudgett
04dc13a781 Merged revisions 256265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r256265 | rmudgett | 2010-04-05 19:39:44 -0500 (Mon, 05 Apr 2010) | 12 lines
  
  Merged revisions 256225 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r256225 | rmudgett | 2010-04-05 19:10:16 -0500 (Mon, 05 Apr 2010) | 5 lines
    
    DAHDI/PRI call to pri_channel_bridge() not protected by PRI lock.
    
    SWP-1231
    ABE-2163
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@256267 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-06 00:53:49 +00:00
Leif Madsen
c8856b1d25 Merged revisions 256161 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r256161 | lmadsen | 2010-04-05 10:14:53 -0500 (Mon, 05 Apr 2010) | 1 line
  
  Fix for localchannel.tex to allow PDFs to be generated again.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@256163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-05 15:15:50 +00:00
Russell Bryant
371a5d2a39 Merged revisions 256015 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r256015 | russell | 2010-04-02 18:46:45 -0500 (Fri, 02 Apr 2010) | 16 lines
  
  Merged revisions 256014 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r256014 | russell | 2010-04-02 18:45:56 -0500 (Fri, 02 Apr 2010) | 9 lines
    
    Resolve a deadlock that occurs due to a pointless call to ast_bridged_channel()
    
    (closes issue #16840)
    Reported by: bzing2
    Patches:
          patch.txt uploaded by bzing2 (license 902)
          issue_16840.rev1.diff uploaded by russell (license 2)
    Tested by: bzing2, russell
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@256017 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-02 23:47:58 +00:00
Russell Bryant
4ee5635b56 Merged revisions 256010 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r256010 | russell | 2010-04-02 18:30:58 -0500 (Fri, 02 Apr 2010) | 9 lines
  
  Merged revisions 256009 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r256009 | russell | 2010-04-02 18:30:15 -0500 (Fri, 02 Apr 2010) | 2 lines
    
    Remove extremely verbose debug message.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@256012 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-02 23:33:51 +00:00
Tilghman Lesher
e02d1e3e11 Merged revisions 255952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r255952 | tilghman | 2010-04-02 15:19:01 -0500 (Fri, 02 Apr 2010) | 8 lines
  
  Pass the PID of the Asterisk process, not the PID of the canary.
  
  (closes issue #17065)
   Reported by: globalnetinc
   Patches: 
         astcanary.patch uploaded by makoto (license 38)
   Tested by: frawd, globalnetinc
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@255954 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-02 20:20:40 +00:00
Tilghman Lesher
7be6bc2191 Merged revisions 255796 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r255796 | tilghman | 2010-04-01 13:16:37 -0500 (Thu, 01 Apr 2010) | 7 lines
  
  Fix DEBUG_THREADS build on Darwin.
  
  (closes issue #16828)
   Reported by: oej
   Patches: 
         20100331__issue16828.diff.txt uploaded by tilghman (license 14)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@255815 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-01 18:21:23 +00:00
Tilghman Lesher
47bfa8efd0 Recorded merge of revisions 255592 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r255592 | tilghman | 2010-03-31 14:13:02 -0500 (Wed, 31 Mar 2010) | 22 lines
  
  Recorded merge of revisions 255591 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r255591 | tilghman | 2010-03-31 14:09:46 -0500 (Wed, 31 Mar 2010) | 15 lines
    
    Ensure line terminators in email are consistent.
    
    Fixes an issue with certain Mail Transport Agents, where attachments are not
    interpreted correctly.
    
    (closes issue #16557)
     Reported by: jcovert
     Patches: 
           20100308__issue16557__1.4.diff.txt uploaded by tilghman (license 14)
           20100308__issue16557__1.6.0.diff.txt uploaded by tilghman (license 14)
           20100308__issue16557__trunk.diff.txt uploaded by tilghman (license 14)
     Tested by: ebroad, zktech
     
    Reviewboard: https://reviewboard.asterisk.org/r/544/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@255675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-31 19:34:39 +00:00