dect
/
asterisk
Archived
13
0
Fork 0
Commit Graph

20824 Commits

Author SHA1 Message Date
tilghman 68a43f3ce0 Merged revisions 297909 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297909 | tilghman | 2010-12-08 12:06:04 -0600 (Wed, 08 Dec 2010) | 11 lines
  
  Merged revisions 297908 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r297908 | tilghman | 2010-12-08 12:04:38 -0600 (Wed, 08 Dec 2010) | 4 lines
    
    Use inheritance to get correct results for SIPFROMDOMAIN.
    
    (from an internal Digium discussion)
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297910 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-08 18:08:27 +00:00
jpeeler ff8c14227d Merged revisions 297825 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297825 | jpeeler | 2010-12-07 16:59:30 -0600 (Tue, 07 Dec 2010) | 26 lines
  
  Merged revisions 297824 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297824 | jpeeler | 2010-12-07 16:58:54 -0600 (Tue, 07 Dec 2010) | 19 lines
    
    Merged revisions 297823 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297823 | jpeeler | 2010-12-07 16:57:48 -0600 (Tue, 07 Dec 2010) | 12 lines
      
      Revert code that changed SSRC for DTMF.
      
      Some previous behavior was attempted to be restored, but mistakingly I did
      not realize that the previous behavior was incorrect. This fixes DTMF not
      being detected since DTMF shouldn't cause the SSRC to change.
      
      (related to issue #17404)
      (closes issue #18189)
      (closes issue #18352)
      Reported by: marcbou
      Tested by: cmbaker82
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297826 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-07 23:00:42 +00:00
tilghman e6958a849a Merged revisions 297821 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297821 | tilghman | 2010-12-07 16:51:05 -0600 (Tue, 07 Dec 2010) | 18 lines
  
  Merged revisions 297819 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297819 | tilghman | 2010-12-07 16:40:45 -0600 (Tue, 07 Dec 2010) | 11 lines
    
    Merged revisions 297818 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297818 | tilghman | 2010-12-07 16:35:50 -0600 (Tue, 07 Dec 2010) | 4 lines
      
      Use non-deprecated APIs for CoreAudio
      
      Review: https://reviewboard.asterisk.org/r/1040/
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297822 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-07 22:54:00 +00:00
tilghman 371474297f Merged revisions 297733 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297733 | tilghman | 2010-12-06 18:29:26 -0600 (Mon, 06 Dec 2010) | 22 lines
  
  Merged revisions 297713 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297713 | tilghman | 2010-12-06 18:21:50 -0600 (Mon, 06 Dec 2010) | 15 lines
    
    Merged revisions 297689 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297689 | tilghman | 2010-12-06 18:07:37 -0600 (Mon, 06 Dec 2010) | 8 lines
      
      Don't create a Local channel if the target extension does not exist.
      
      (closes issue #18126)
       Reported by: junky
       Patches: 
             followme.diff uploaded by junky (license 177)
             (partially restructured by me to avoid a possible memory leak)
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297734 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-07 00:31:20 +00:00
jpeeler 55c65ef348 Merged revisions 297607 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297607 | jpeeler | 2010-12-06 16:06:37 -0600 (Mon, 06 Dec 2010) | 25 lines
  
  Merged revisions 297605 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297605 | jpeeler | 2010-12-06 16:03:04 -0600 (Mon, 06 Dec 2010) | 18 lines
    
    Merged revisions 297603 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297603 | jpeeler | 2010-12-06 15:57:15 -0600 (Mon, 06 Dec 2010) | 12 lines
      
      Improve handling of REGISTER requests with multiple contact headers.
      
      The changes here attempt to more strictly follow RFC 3261 section 10.3.
      Basically the following will now cause a 400 Bad Response to be returned, if:
      - multiple Contact headers are present with one set to expire all bindings ("*")
      - wildcard parameter is specified for Contact without Expires header or Expires
        header is not set to zero.
      
      ABE-2442
      ABE-2443
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297608 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-06 22:10:41 +00:00
seanbright d99eeb9bb1 Merged revisions 297535 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297535 | seanbright | 2010-12-03 12:41:30 -0500 (Fri, 03 Dec 2010) | 9 lines
  
  Merged revisions 297534 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r297534 | seanbright | 2010-12-03 12:40:52 -0500 (Fri, 03 Dec 2010) | 3 lines
    
    The CLI command should not contain <placeholder>s, these are for descriptions.
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297536 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-03 17:42:23 +00:00
mnicholson 74a4a31f86 Merged revisions 297157,297486,297495 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r297157 | mnicholson | 2010-12-01 13:47:33 -0600 (Wed, 01 Dec 2010) | 2 lines
  
  Changed some NOTICE and WARNING messages to DEBUG messages.
........
  r297486 | mnicholson | 2010-12-02 15:30:47 -0600 (Thu, 02 Dec 2010) | 6 lines
  
  Add support for reserving a fax session before answering the channel.
  
  Note: this change breaks ABI compatibility.
  
  FAX-217
........
  r297495 | mnicholson | 2010-12-03 09:21:52 -0600 (Fri, 03 Dec 2010) | 4 lines
  
  Print a DEBUG message instead of a WARNING message when the selected fax tech does not support reserving sessions.
  
  Answer the channel before quering it for t.38 support.  This is necessary for the query to work properly over local channels.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297496 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-03 15:32:22 +00:00
pabelanger 184c5bf3a8 Merged revisions 297406 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297406 | pabelanger | 2010-12-02 15:09:29 -0500 (Thu, 02 Dec 2010) | 21 lines
  
  Merged revisions 297405 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297405 | pabelanger | 2010-12-02 15:06:43 -0500 (Thu, 02 Dec 2010) | 14 lines
    
    Merged revisions 297404 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297404 | pabelanger | 2010-12-02 15:01:08 -0500 (Thu, 02 Dec 2010) | 7 lines
      
      Resolve compile error under FreeBSD
      
      We now set _ASTCFLAGS+=-march=i686 for i386 processors, still allowing ASTCFLAGS
      to override the setting.
      
      Review: https://reviewboard.asterisk.org/r/1043/
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297407 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-02 20:11:32 +00:00
twilson 604460d842 Merged revisions 297312 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297312 | twilson | 2010-12-02 12:13:49 -0600 (Thu, 02 Dec 2010) | 28 lines
  
  Merged revisions 297311 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297311 | twilson | 2010-12-02 12:07:39 -0600 (Thu, 02 Dec 2010) | 21 lines
    
    Merged revisions 297310 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297310 | twilson | 2010-12-02 12:00:27 -0600 (Thu, 02 Dec 2010) | 12 lines
      
      Initialize offset for adaptive jitter buffer
      
      When the adaptive jitter buffer is enabled in sip.conf, the first frame placed
      in the jitter buffer fails with something like:
      
      jb_warning_output: Resyncing the jb. last_delay 0, this delay -215886466,
      threshold 1000, new offset 215886466
      
      This happens because the offset is not initialized before calling jb_put(). This
      patch modifies jb_put_first_adaptive() to set the offset to the frame's
      timestamp.
    
      Review: https://reviewboard.asterisk.org/r/1041/
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297356 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-02 18:28:50 +00:00
russell f85546e84f Merged revisions 297245 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297245 | russell | 2010-12-02 07:20:19 -0600 (Thu, 02 Dec 2010) | 20 lines
  
  Merged revisions 297229 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297229 | russell | 2010-12-02 07:16:47 -0600 (Thu, 02 Dec 2010) | 13 lines
    
    Merged revisions 297228 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297228 | russell | 2010-12-02 07:16:15 -0600 (Thu, 02 Dec 2010) | 6 lines
      
      Add "DAHDI" to a couple of app_meetme error messages.
      
      This is in response to some questions on IRC.  To the user, there was nothing
      that made it obvious that this error had anything to do with DAHDI not being
      loaded.
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297248 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-02 13:20:48 +00:00
jpeeler 286b2c53a7 Merged revisions 297075 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297075 | jpeeler | 2010-12-01 11:53:13 -0600 (Wed, 01 Dec 2010) | 37 lines
  
  Merged revisions 297073 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297073 | jpeeler | 2010-12-01 11:52:46 -0600 (Wed, 01 Dec 2010) | 30 lines
    
    Merged revisions 297072 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297072 | jpeeler | 2010-12-01 11:50:09 -0600 (Wed, 01 Dec 2010) | 23 lines
      
      Fix not stopping MOH when transfered local channel queue member is answered.
      
      The problem here is only present when local channels are used with the MOH
      passthru option as well as no optimization (/nm). I will describe the slightly
      bizarre scenario that was used to test, where phones B and C are queue members:
      
      Phone A dials into a queue with two members using local channels and the above
      options. Phone B answers. Phone A blind transfers phone B into the same queue.
      Phone A hangs up. Phone C answers, but phone B didn't stop playing MOH.
      
      In this scenario, the unhold frame that should have gotten to phone B never
      arrived due to the masquerade from the blind transfer. This is usually fine
      since app_queue manages the starting and stopping of MOH. However, with the
      passthrough option enabled when app_queue attempts to stop MOH it tries to do
      so on the local channel rather than the real channel. The easiest solution
      was to just make sure to send an unhold frame during the transfer since it
      wouldn't make sense to have MOH playing after a transfer anyway. This only
      modifies SIP transfers, but the other transfers did not seem to be a problem.
      If DTMF based transfers were a problem it might be okay to add ast_moh_stop
      to finishup, but I didn't want to have to add that unless required.
      
      ABE-2624
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297076 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-01 17:53:54 +00:00
tilghman 9947461351 Merged revisions 296992 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296992 | tilghman | 2010-12-01 11:01:56 -0600 (Wed, 01 Dec 2010) | 19 lines
  
  Merged revisions 296991 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r296991 | tilghman | 2010-12-01 11:01:00 -0600 (Wed, 01 Dec 2010) | 12 lines
    
    Merged revisions 296990 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r296990 | tilghman | 2010-12-01 10:59:26 -0600 (Wed, 01 Dec 2010) | 5 lines
      
      Clarify documentation on how we store codec preference lists.
      
      (closes issue #18397)
       Reported by: birgita
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296993 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-01 17:03:05 +00:00
tilghman f3e3d9a061 Merged revisions 296951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296951 | tilghman | 2010-11-30 19:46:32 -0600 (Tue, 30 Nov 2010) | 9 lines
  
  Merged revisions 296950 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r296950 | tilghman | 2010-11-30 19:38:19 -0600 (Tue, 30 Nov 2010) | 2 lines
    
    Missed initializations caused startup errors on Mac OS X (and possibly others, too).
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296952 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-01 02:02:04 +00:00
jpeeler 29408030d5 Merged revisions 296870 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296870 | jpeeler | 2010-11-30 18:28:16 -0600 (Tue, 30 Nov 2010) | 18 lines
  
  Merged revisions 296869 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r296869 | jpeeler | 2010-11-30 18:24:58 -0600 (Tue, 30 Nov 2010) | 11 lines
    
    Merged revisions 296868 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r296868 | jpeeler | 2010-11-30 18:23:19 -0600 (Tue, 30 Nov 2010) | 4 lines
      
      Properly restore backup information file when hanging up during message prepending.
      
      ABE-2654
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296871 f38db490-d61c-443f-a65b-d21fe96a405b
2010-12-01 00:28:54 +00:00
tilghman c3e5b57e6c Add a comment on why the reserved bit is reserved.
Came up when reviewing discussion on the CODEC PREFS IE in IAX2.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296826 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-30 22:32:20 +00:00
tilghman 5c39a3d779 Merged revisions 296787 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r296787 | tilghman | 2010-11-30 13:12:48 -0600 (Tue, 30 Nov 2010) | 2 lines
  
  DOC: Conference number can be omitted; if omitted, all users in a meetme are listed.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296788 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-30 19:13:54 +00:00
schmidts c6d866ff51 move devices from hints into an ao2_container
by splitting up devices from hints into an own ao2_container the callback to
get these devices for statechange handling is faster.
with this changes the length of a device used in a hint isnt longer restricted
to 80 characters.

Tests showed that calling handle_statechange is 40 times faster if no hints
are used and 25 times faster if there are any hints.

(closes issue #17928)
Reported by: mdu113
Tested by: schmidts

Review: https://reviewboard.asterisk.org/r/1003/



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296752 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-30 09:49:25 +00:00
pabelanger 266bd285ab Merged revisions 296673 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296673 | pabelanger | 2010-11-29 18:05:45 -0500 (Mon, 29 Nov 2010) | 19 lines
  
  Merged revisions 296671 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r296671 | pabelanger | 2010-11-29 17:54:14 -0500 (Mon, 29 Nov 2010) | 12 lines
    
    Merged revisions 296670 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r296670 | pabelanger | 2010-11-29 17:49:39 -0500 (Mon, 29 Nov 2010) | 5 lines
      
      Make sure nothing else is needed before destroying the scheduler.
      
      (closes issue #18398)
      Reported by: pabelanger
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296674 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-29 23:07:06 +00:00
russell 246c1f74e1 Merged revisions 296628 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r296628 | russell | 2010-11-29 15:26:44 -0600 (Mon, 29 Nov 2010) | 6 lines
  
  Complete some error handling in transmit_publish() in chan_sip.c.
  
  This error handling block caught my eye.  It was missing a couple of things,
  but it should be safe now.  Thanks to mmichelson for the quick peer review
  on IRC.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296630 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-29 21:31:05 +00:00
rmudgett 4629702513 Merged revisions 296582 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296582 | rmudgett | 2010-11-29 14:46:03 -0600 (Mon, 29 Nov 2010) | 24 lines
  
  Merged revision 296575 from
  https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier
  
  ..........
    r296575 | rmudgett | 2010-11-29 14:27:37 -0600 (Mon, 29 Nov 2010) | 13 lines
  
    Invalid mISDN PTMP redirecting signaling as TE towards NT.
  
    The mISDN PTMP redirection signaling (NOTIFY redirecting number and
    notification code, SETUP redirecting number) is also sent in PTMP/TE mode.
    It should only apply in PTMP/NT mode.  The call setup proceeds but the
    network (Deutsche Telekom) reacts with ugly ISDN STATUS messages.
  
    Also don't send the redirecting number ie when PTP is also sending the
    DivertingLegInformation2 facility.  The redirecting number ie is redundant
    and the network (Deutsche Telekom) complains about it.
  
    Patches:
          abe_2651_v4.patch uploaded by rmudgett (license 664)
  
    JIRA ABE-2651
    JIRA SWP-2537
  ..........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296585 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-29 20:54:27 +00:00
tilghman 3fc049cf91 Merged revisions 296534 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296534 | tilghman | 2010-11-29 01:28:44 -0600 (Mon, 29 Nov 2010) | 20 lines
  
  Merged revisions 296533 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r296533 | tilghman | 2010-11-29 01:27:09 -0600 (Mon, 29 Nov 2010) | 13 lines
    
    I love standards.  There are so many to choose from.  Except when there isn't one.
    
    Linux and *BSD disagree on the elements within the ucred structure.  Detect
    which one is in use on the system.
    
    (closes issue #18384)
     Reported by: bjm
     Patches: 
           cred-diffs uploaded by bjm (license 473)
           20101127__issue18384__1.6.2.diff.txt uploaded by tilghman (license 14)
           20101127__issue18384__1.8.diff.txt uploaded by tilghman (license 14)
     Tested by: tilghman, bjm
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296535 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-29 07:30:09 +00:00
tilghman 622ca0a012 Merged revisions 296467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296467 | tilghman | 2010-11-27 04:40:22 -0600 (Sat, 27 Nov 2010) | 12 lines
  
  Merged revisions 296466 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r296466 | tilghman | 2010-11-27 04:39:01 -0600 (Sat, 27 Nov 2010) | 5 lines
    
    18 characters is too short for most date/times (20 is the usual, but we add more in case of greater precision).
    
    (closes issue #18369)
     Reported by: tnakonz
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296468 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-27 10:41:20 +00:00
tilghman faf6a479bf Merged revisions 296429 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r296429 | tilghman | 2010-11-27 03:58:57 -0600 (Sat, 27 Nov 2010) | 5 lines
  
  Also don't build DEBUG_FD_LEAKS when STANDALONE2 is defined.
  
  (closes issue #18385)
   Reported by: cmaj
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296430 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-27 10:00:35 +00:00
oej 9cbeb6626c Merged revisions 296391 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296391 | oej | 2010-11-26 22:37:21 +0100 (Fre, 26 Nov 2010) | 24 lines
  
  Merged revisions 296351 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r296351 | oej | 2010-11-26 13:23:03 +0100 (Fre, 26 Nov 2010) | 17 lines
    
    Merged revisions 296309 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r296309 | oej | 2010-11-26 10:53:31 +0100 (Fre, 26 Nov 2010) | 11 lines
      
      Fix bugs in saying numbers using the Swedish language syntax
      
      (closes issue #18355)
      Reported by: oej
      Patch by: oej
      
      Much help from Peter Lindahl. Testing by the ClearIT team during a coffee break.
      
      Review: https://reviewboard.asterisk.org/r/1033/
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296393 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-26 22:02:00 +00:00
marquis 89a0adaac7 Merged revisions 296354 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r296354 | marquis | 2010-11-26 13:31:17 -0500 (Fri, 26 Nov 2010) | 12 lines
  
  Fix XMPP PubSub-based distributed device state.
  
  Initialize pubsubflags to 0 so res_jabber doesn't think there is already an XMPP connection sending device state.  Also clean up CLI commands a bit.
  
  (closes issue #18272)
  Reported by: klaus3000
  Patches:
        res_jabber_fix_pubsubflags_and_CLI-patch.txt uploaded by klaus3000 (license 65)
  Tested by: klaus3000, Marquis
  
  Review: https://reviewboard.asterisk.org/r/1030/
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296355 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-26 18:31:48 +00:00
marquis badff4ea10 Merged revisions 296352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r296352 | marquis | 2010-11-26 13:19:02 -0500 (Fri, 26 Nov 2010) | 12 lines
  
  Fix reloading of peer when a user is requested.
  
  Prevent peer reloading from causing multiple MWI subscriptions to be created when using realtime.  This had the effect of sending one NOTIFY for every time a sip peer made a call, in one case eventually overwhelming  the phone and causing it to reboot.
  
  (closes issue #18342)
  Reported by: nivek
  Patches:
        issue0018342p1.patch uploaded by nivek (license 636)
  Tested by: nivek
  
  Review: https://reviewboard.asterisk.org/r/1029/
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296353 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-26 18:23:02 +00:00
citywok c11f5b1732 Meetme use voicemail greet for join/leave announce
Added option v(mailbox@[context]) which tells MeetMe where to look for a users greet file.  If one does not exist it clears the v option and defers to the functionality of i/I as/if set by the MeetMe() command.

Review: https://reviewboard.asterisk.org/r/1009/
(closes issue #18297)
Reported by: parisioa
Patches:
	meetme_final_patch_v.diff uploaded by parisioa (license 1153)



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296249 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-24 23:46:14 +00:00
russell b9f69075fb Merged revisions 296230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296230 | russell | 2010-11-24 17:29:44 -0600 (Wed, 24 Nov 2010) | 20 lines
  
  Merged revisions 296221 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r296221 | russell | 2010-11-24 17:28:19 -0600 (Wed, 24 Nov 2010) | 13 lines
    
    Merged revisions 296213 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r296213 | russell | 2010-11-24 17:26:43 -0600 (Wed, 24 Nov 2010) | 6 lines
      
      Make Asterisk less crashy.
      
      Since we might not put a new translation path on the channel, go ahead and
      set it to NULL right after destroying the old one to ensure we don't try
      to free an invalid translation path later on.
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296235 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-24 23:30:32 +00:00
rmudgett 2c639aaf44 Merged revisions 296167 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296167 | rmudgett | 2010-11-24 16:49:48 -0600 (Wed, 24 Nov 2010) | 57 lines
  
  Merged revisions 296166 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r296166 | rmudgett | 2010-11-24 16:42:45 -0600 (Wed, 24 Nov 2010) | 50 lines
    
    Merged revisions 296165 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r296165 | rmudgett | 2010-11-24 16:41:07 -0600 (Wed, 24 Nov 2010) | 43 lines
      
      Oneway audio to SIP phone from FXS port after FXS port gets a CallWaiting pip.
      
      The FXS connected phone has to have CW/CID support to fail, as it will
      send back a DTMF 'A' or 'D' when it's ready to receive CallerID.  A normal
      phone with no CID never fails.  Also the SIP phone does not hear MOH when
      the CW call is answered.
      
      The DTMF end frame is suppressed when the phone acknowledges the CW signal
      for CID.  The problem is the DTMF begin frame needs to be suppressed as
      well.  The DTMF begin frame is causing SIP to start sending the DTMF RTP
      frames.  Since the DTMF end frame is suppressed, SIP will not stop sending
      those DTMF RTP packets.
      
      * Suppress the DTMF begin and end frames when the channel driver is
      looking for DTMF digits.
      
      * Fixed a couple issues caused by not cleaning up the CID spill if you
      answer the CW call while it is sending the CID spill.
      
      * Fixed not sending CW/CID spill to the phone when the call is natively
      bridged.  (Fixed by not using native bridge if CW/CID is possible.)
      
      * Suppress received audio when sending CW/CID spills.  The other parties
      involved do not need to hear the CW/CID spills and may be confused if the
      CW call is for them.
      
      (closes issue #18129)
      Reported by: alecdavis
      Patches:
            issue_18129_v1.8_v3.patch uploaded by rmudgett (license 664)
      Tested by: alecdavis, rmudgett
      
      
      NOTE:
      
      * v1.4 does not have the main problem fixed by suppressing the DTMF start
      frames.  The other three items fixed are relevant.
      
      * If you really must restore native bridging between analog ports, you
      need to disable CW/CID either by configuring chan_dahdi.conf
      callwaitingcallerid=no or dialing *70 before dialing the number to
      temporarily disable CW.
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296168 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-24 22:52:07 +00:00
russell 44e92fbc2b Merged revisions 296084 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296084 | russell | 2010-11-24 14:23:46 -0600 (Wed, 24 Nov 2010) | 26 lines
  
  Merged revisions 296083 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r296083 | russell | 2010-11-24 14:23:11 -0600 (Wed, 24 Nov 2010) | 19 lines
    
    Merged revisions 296082 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r296082 | russell | 2010-11-24 14:22:32 -0600 (Wed, 24 Nov 2010) | 12 lines
      
      Fix false reporting of an error by set_format().
      
      In the case that the native format was able to be changed to match the
      new requested format, the code proceeded to attempt to build a translation
      path, anyway.  The result would be NULL, since no translation path is
      necessary and resulted in this function thinking an error has occurred.
      This case is now specifically caught and no attempt to build a translation
      path is attempted.
      
      Thanks to our automated tests and bamboo.asterisk.org for catching this problem
      and making a whole lot of noise when things started failing.  :-)
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296085 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-24 20:24:38 +00:00
russell 55a1c5fbde Merged revisions 296002 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296002 | russell | 2010-11-24 11:13:08 -0600 (Wed, 24 Nov 2010) | 52 lines
  
  Merged revisions 296001 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r296001 | russell | 2010-11-24 11:03:16 -0600 (Wed, 24 Nov 2010) | 45 lines
    
    Merged revisions 296000 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r296000 | russell | 2010-11-24 10:48:39 -0600 (Wed, 24 Nov 2010) | 38 lines
      
      Handle failures building translation paths more effectively.
      
      The problem scenario occurred on a heavily loaded system that was using the
      codec_dahdi module and exceeded the hardware transcoding capacity.  The failure
      mode at that point was not good.  The report came in to us as an Asterisk
      lock-up.  The "core show locks" shows a ton of threads locked up (but no
      obvious deadlock).  Upon deeper investigation, when the system is in this
      state, the CPU was maxed out.  The CPU was being consumed by the Asterisk
      logger spewing messages on every audio frame for calls set up after transcoder
      capacity was reached.
      
      The purpose of this patch is to make Asterisk handle failures to create a
      translation path in a more graceful manner.  If we can't translate, then the
      call just needs to be dropped, as it's not going to work.  These are the
      changes:
      
      1) In set_format() of channel.c (which is called by set_read_format() and
      set_write_format()), it was ignoring if ast_translator_build_path() failed and
      returned NULL.  It now pays attention to that case and returns a result
      reflecting failure.  With this change in place, the bridging code will
      immediately detect a failure and end the bridge instead of proceeding to try to
      bridge frames that can't be translated and making channel drivers freak out by
      sending them frames in a format they weren't expecting.
      
      2) In ast_indicate_data() of channel.c, failure of ast_playtones_start() was
      ignored.  It is now reflected in the return value of the function.  This didn't
      turn out to have any affect on the bug, but seemed like a good change to leave
      in.
      
      3) In app_dial(), when only sending a call to a single endpoint, it will
      attempt to do some bridging of its own of early audio.  It uses
      make_compatible() when it's going to do this.  However, it ignored failure from
      make compatible.  So, even with the fix from #1, if there was early audio going
      through app_dial, there would still be a period of invalid frames passing
      through.  After detecting failure here, Dial() exits.
      
      ABE-2658
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@296034 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-24 17:23:39 +00:00
oej ca1b7be94f Merged revisions 295949 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295949 | oej | 2010-11-23 11:30:05 +0100 (Tis, 23 Nov 2010) | 21 lines
  
  Merged revisions 295907 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r295907 | oej | 2010-11-23 10:36:38 +0100 (Tis, 23 Nov 2010) | 14 lines
    
    Merged revisions 295906 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r295906 | oej | 2010-11-23 10:28:14 +0100 (Tis, 23 Nov 2010) | 8 lines
      
      Fix support of saynumber(1,n) in the Swedish language
      
      (closes issue #18353)
      Reported by: oej
      
      Review: https://reviewboard.asterisk.org/r/1031/
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295950 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-23 10:34:17 +00:00
seanbright e45a5c2a64 Merged revisions 295869 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295869 | seanbright | 2010-11-22 15:03:49 -0500 (Mon, 22 Nov 2010) | 9 lines
  
  Merged revisions 295868 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r295868 | seanbright | 2010-11-22 15:02:37 -0500 (Mon, 22 Nov 2010) | 2 lines
    
    Change some documentation to suggest dahdi_monitor instead of ztmonitor.
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295870 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-22 20:05:10 +00:00
rmudgett 4ead3b5ab1 Merged revisions 295866 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295866 | rmudgett | 2010-11-22 13:36:10 -0600 (Mon, 22 Nov 2010) | 60 lines
  
  Merged revisions 295843 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r295843 | rmudgett | 2010-11-22 13:28:23 -0600 (Mon, 22 Nov 2010) | 53 lines
    
    Merged revisions 295790 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r295790 | rmudgett | 2010-11-22 12:46:26 -0600 (Mon, 22 Nov 2010) | 46 lines
      
      The channel redirect function (CLI or AMI) hangs up the call instead of redirecting the call.
      
      To recreate the problem:
      1) Party A calls Party B
      2) Invoke CLI "channel redirect" command to redirect channel call leg
      associated with A.
      3) All associated channels are hung up.
      
      Note that if the CLI command were done on the channel call leg associated
      with B it works.
      
      This regression was a result of the fix for issue #16946
      (https://reviewboard.asterisk.org/r/740/).
      
      The regression affects all features that use an async goto to execute the
      dialplan because of an external event: Channel redirect, AMI redirect, SIP
      REFER, and FAX detection.
      
      The struct ast_channel._softhangup code is a mess.  The variable is used
      for several purposes that do not necessarily result in the call being hung
      up.  I have added doxygen comments to describe how the various _softhangup
      bits are used.  I have corrected all the places where the variable was
      tested in a non-bit oriented manner.
      
      The primary fix is the new AST_CONTROL_END_OF_Q frame.  It acts as a weak
      hangup request so the soft hangup requests that do not normally result in
      a hangup do not hangup.
      
      JIRA SWP-2470
      JIRA SWP-2489
      
      (closes issue #18171)
      Reported by: SantaFox
      (closes issue #18185)
      Reported by: kwemheuer
      (closes issue #18211)
      Reported by: zahir_koradia
      (closes issue #18230)
      Reported by: vmarrone
      (closes issue #18299)
      Reported by: mbrevda
      (closes issue #18322)
      Reported by: nerbos
      
      Review:	https://reviewboard.asterisk.org/r/1013/
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295867 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-22 19:42:02 +00:00
espiceland 6558fbe18a Revert to the previous behavior of AGI command WAIT FOR DIGIT, since the
behavior of the command with this patch is almost exactly like that of GET DATA.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295789 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-22 18:43:31 +00:00
rmudgett 20147eda82 Merged revisions 295747 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295747 | rmudgett | 2010-11-19 21:11:15 -0600 (Fri, 19 Nov 2010) | 13 lines
  
  One way audio before answering call waiting call on analog port.
  
  * Analog call waiting Caller ID spills could get stuck resulting in one
  way audio until the waiting call is answered.  This only happens on the
  second (and later) call waiting call if the active call is not the first
  call.
  
  * The CLI/AMI "dahdi show channel" command could report the wrong channel
  information.
  
  Must keep the struct analog_pvt.owner and struct dahdi_pvt.owner pointer
  in sync.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295748 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-20 03:13:24 +00:00
russell a08dd79e87 Merged revisions 295711 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295711 | russell | 2010-11-19 18:50:00 -0600 (Fri, 19 Nov 2010) | 36 lines
  
  Merged revisions 295710 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r295710 | russell | 2010-11-19 18:45:51 -0600 (Fri, 19 Nov 2010) | 29 lines
    
    Fix cache of device state changes for multiple servers.
    
    This patch addresses a regression where device states across multiple servers
    were not being processing completely correctly.  The code works to determine
    the overall state by looking at the last known state of a device on each
    server.  However, there was a regression due to some invasive rewrites of how
    the cache works that led to the cache only storing the last device state change
    for a device, regardless of which server it was on.
    
    The code is set up to cache device state change events by ensuring that each
    event in the cache has a unique device name + entity ID (server ID).  The code
    that was responsible for comparing raw information elements (which EID is)
    always returned a match due to a memcmp() with a length of 0.
    
    There isn't much code to fix the actual bug.  This patch also introduces a new
    CLI command that was very useful for debugging this problem.  The command
    allows you to dump the contents of the event cache.
    
    (closes issue #18284)
    Reported by: klaus3000
    Patches:
          issue18284.rev1.txt uploaded by russell (license 2)
    Tested by: russell, klaus3000
    
    (closes issue #18280)
    Reported by: klaus3000
    
    Review: https://reviewboard.asterisk.org/r/1012/
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295712 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-20 00:52:47 +00:00
twilson 2f4dec5c60 Merged revisions 295673 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295673 | twilson | 2010-11-19 14:06:10 -0800 (Fri, 19 Nov 2010) | 22 lines
  
  Merged revisions 295672 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r295672 | twilson | 2010-11-19 13:55:48 -0800 (Fri, 19 Nov 2010) | 15 lines
    
    Merged revisions 295628 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r295628 | twilson | 2010-11-19 12:53:36 -0800 (Fri, 19 Nov 2010) | 8 lines
      
      Discard responses with more than one Via
      
      This is not a perfect solution as headers that are joined via commas are not
      detected. This is a parsing issue that to fix "correctly" would necessitate 
      a new SIP parser.
      
      Review: https://reviewboard.asterisk.org/r/1019/
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295674 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-19 22:15:49 +00:00
bbryant 3da4668e97 Merged revisions 295670 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295670 | bbryant | 2010-11-19 16:40:21 -0500 (Fri, 19 Nov 2010) | 8 lines
  
  Patch for deadlock from ordering issue between channel/queue locks in app_queue
  (set_queue_variables).
  
  (closes issue #18031)
  Reported by: rain
  
  Review: https://reviewboard.asterisk.org/r/1018/
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295671 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-19 21:42:10 +00:00
espiceland fa420ca248 Add extra functionality to AGI command WAIT FOR DIGIT.
Add the ability to play a sound file, listen for more than just one digit,
specify
escape characters. Backwards compatible (to work with only timeout specified).

(closes issue #15531)
Reported by: diLLec
Patches:
      asterisk-res_agi-203638-patched.patch uploaded by diLLec (license 839)
Tested by: diLLec, espiceland



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295554 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-19 19:32:56 +00:00
rmudgett 5a03dbaad3 Merged revisions 295516 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295516 | rmudgett | 2010-11-19 10:47:11 -0600 (Fri, 19 Nov 2010) | 13 lines
  
  Bring sig_analog extraction more into alignment with orig-trunk/v1.6.2 chan_dahdi.
  
  * Restore SMDI support.
  * Fixed initial value of struct analog_pvt.use_callerid.  It may get
  forced on depending upon other config options.
  * Call analog_dnd() instead of manual inlined code.
  * Removed unused struct analog_pvt.usedistinctiveringdetection.
  * Removed the struct analog_pvt.unknown_alarm flag.  It was really the
  struct analog_pvt.inalarm flag.
  * Use ast_debug() instead of ast_log(LOG_DEBUG).
  * Rename several function's index variable to idx.
  * Some formatting tweaks.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295517 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-19 16:49:54 +00:00
lmadsen d4d9c92953 Merged revisions 295477 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295477 | lmadsen | 2010-11-18 14:30:35 -0600 (Thu, 18 Nov 2010) | 6 lines
  
  'sip notify clear-mwi' needs terminating CRLF.
  
  (closes issue #18275)
  Reported by: klaus3000
  Patches:
        fix_body_CRLF_patch.txt uploaded by klaus3000 (license 65)
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295478 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-18 20:31:23 +00:00
pabelanger 0072b7a596 Merged revisions 295441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295441 | pabelanger | 2010-11-18 13:02:12 -0500 (Thu, 18 Nov 2010) | 11 lines
  
  Merged revisions 295440 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r295440 | pabelanger | 2010-11-18 12:51:34 -0500 (Thu, 18 Nov 2010) | 4 lines
    
    Fix compiler warnings when using openssl-dev 1.0.0+
    
    Review: https://reviewboard.asterisk.org/r/1016/
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295442 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-18 18:08:43 +00:00
pabelanger 94c6ae5e43 Merged revisions 295404 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295404 | pabelanger | 2010-11-18 00:12:05 -0500 (Thu, 18 Nov 2010) | 2 lines
  
  Add RedHat specific dependencies
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295405 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-18 05:13:45 +00:00
pabelanger e0a4714ef5 Merged revisions 295361 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295361 | pabelanger | 2010-11-17 09:09:38 -0500 (Wed, 17 Nov 2010) | 2 lines
  
  Uncomment settings under [global], to surpress warning when loading Asterisk.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295364 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-17 14:22:42 +00:00
rmudgett 86b0ce0eae Merged revisions 295282 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295282 | rmudgett | 2010-11-16 17:02:36 -0600 (Tue, 16 Nov 2010) | 16 lines
  
  Merged revisions 295281 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r295281 | rmudgett | 2010-11-16 16:57:07 -0600 (Tue, 16 Nov 2010) | 9 lines
    
    Merged revisions 295280 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r295280 | rmudgett | 2010-11-16 16:52:06 -0600 (Tue, 16 Nov 2010) | 1 line
      
      Dead code elimination in channel.c:ast_channel_bridge() variable who.
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295283 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-16 23:04:55 +00:00
russell 00715d0a93 Merged revisions 295278 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295278 | russell | 2010-11-16 16:41:11 -0600 (Tue, 16 Nov 2010) | 2 lines
  
  Check for pdftotext and give a useful error if not found.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295279 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-16 22:41:32 +00:00
russell 61ecc39c20 Merged revisions 295201 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295201 | russell | 2010-11-16 15:46:18 -0600 (Tue, 16 Nov 2010) | 2 lines
  
  Remove intentional typo I had added when testing the check.  oops.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295202 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-16 21:46:39 +00:00
russell caa2b7549d Merged revisions 295164 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295164 | russell | 2010-11-16 14:50:03 -0600 (Tue, 16 Nov 2010) | 2 lines
  
  Check for wikiexport.py in PATH and give a useful error message if not found.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295165 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-16 20:50:31 +00:00
russell 4b166682f7 Remove a trailing space.
(testing something with bamboo ...)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295125 f38db490-d61c-443f-a65b-d21fe96a405b
2010-11-16 17:14:09 +00:00