git.asterisk.org Git - asterisk/asterisk.git/log

Merged revisions 304097 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304097 | seanbright | 2011-01-25 20:26:26 -0500 (Tue, 25 Jan 2011) | 19 lines

  Merged revisions 304096 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r304096 | seanbright | 2011-01-25 20:24:58 -0500 (Tue, 25 Jan 2011) | 12 lines

    Per the man page, setvbuf() must be called before any other operation on an open file.

    We use setvbuf() to associate a buffer with a stream, but we have already written
    to the open file.  This works (by chance) on Linux, but fails on other platforms,
    such as OpenSolaris.

    (closes issue #16610)
    Reported by: bklang
    Patches:
          setvbuf.patch uploaded by crjw (license 963)
    Tested by: bklang, asgaroth, efutch
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304098 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 304007 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304007 | rmudgett | 2011-01-25 17:28:25 -0600 (Tue, 25 Jan 2011) | 22 lines

  Merged revisions 304006 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r304006 | rmudgett | 2011-01-25 17:25:32 -0600 (Tue, 25 Jan 2011) | 15 lines

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

    ........
      r304005 | rmudgett | 2011-01-25 17:21:09 -0600 (Tue, 25 Jan 2011) | 8 lines

      DTMF attended transfers sometimes fail for no apparent reason.

      The loop in feature_request_and_dial() can exit when Party C has answered
      without processing an AST_CONTROL_ANSWER.  Also sometimes an
      AST_CONTROL_ANSWER never happens even though Party C has answered.

      Don't hangup Party C if he is up or we receive an AST_CONTROL_ANSWER.
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304008 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 303962 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303962 | twilson | 2011-01-25 16:09:01 -0600 (Tue, 25 Jan 2011) | 30 lines

  Merged revisions 303960 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r303960 | twilson | 2011-01-25 16:02:42 -0600 (Tue, 25 Jan 2011) | 23 lines

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

    ........
      r303906 | twilson | 2011-01-25 14:50:59 -0600 (Tue, 25 Jan 2011) | 16 lines

      Guard against retransmitting BYEs indefinitely

      In the case of an attended transfer (A calls B, A atxfers to C) where
      A becomes unreachable before replying to Asterisk's BYE, Asterisk can
      sometimes retransmit the BYE indefinitely. This is because
      __sip_autodestruct tests p->refer && !ast_test_flag(&p->flags[0],
      SIP_ALREADYGONE and will then transmit a BYE. When this BYE times out,
      it will not ever be marked as ALREADYGONE, so when __sip_autodestruct
      is called again, we end up starting the cycle over.

      This patch adds a call to sip_alreadygone(pkt->owner) in retrans_pkt
      in the case of a BYE that has timed out. This should prevent Asterisk
      from trying to transmit new BYE messages in the future.

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303963 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 303860 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303860 | tilghman | 2011-01-25 12:55:27 -0600 (Tue, 25 Jan 2011) | 12 lines

  Merged revisions 303858 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r303858 | tilghman | 2011-01-25 12:41:26 -0600 (Tue, 25 Jan 2011) | 5 lines

    Fix "sip show user <tab>", so that it actually shows results, instead of just completing the last entry.

    (closes issue #16675)
    Reported by: pj
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303861 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 303771 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303771 | rmudgett | 2011-01-25 11:49:20 -0600 (Tue, 25 Jan 2011) | 54 lines

  Merged revisions 303769 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r303769 | rmudgett | 2011-01-25 11:42:42 -0600 (Tue, 25 Jan 2011) | 47 lines

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

    ........
      r303765 | rmudgett | 2011-01-25 11:36:50 -0600 (Tue, 25 Jan 2011) | 40 lines

      Sending out unnecessary PROCEEDING messages breaks overlap dialing.

      Issue #16789 was a good idea.  Unfortunately, it breaks overlap dialing
      through Asterisk.  There is not enough information available at this point
      to know if dialing is complete.  The ast_exists_extension(),
      ast_matchmore_extension(), and ast_canmatch_extension() calls are not
      adequate to detect a dial through extension pattern of "_9!".

      Workaround is to use the dialplan Proceeding() application early in
      non-dial through extensions.

      * Effectively revert issue #16789.

      * Allow outgoing overlap dialing to hear dialtone and other early media.
      A PROGRESS "inband-information is now available" message is now sent after
      the SETUP_ACKNOWLEDGE message for non-digital calls.  An
      AST_CONTROL_PROGRESS is now generated for incoming SETUP_ACKNOWLEDGE
      messages for non-digital calls.

      * Handling of the AST_CONTROL_CONGESTION in chan_dahdi/sig_pri was
      inconsistent with the cause codes.

      * Added better protection from sending out of sequence messages by
      combining several flags into a single enum value representing call
      progress level.

      * Added diagnostic messages for deferred overlap digits handling corner
      cases.

      (closes issue #17085)
      Reported by: shawkris

      (closes issue #18509)
      Reported by: wimpy
      Patches:
            issue18509_early_media_v1.8_v3.patch uploaded by rmudgett (license 664)
            Expanded upon issue18509_early_media_v1.8_v3.patch to include analog
            and SS7 because of backporting requirements.
      Tested by: wimpy, rmudgett
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303772 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 303678 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303678 | jpeeler | 2011-01-25 11:02:38 -0600 (Tue, 25 Jan 2011) | 33 lines

  Merged revisions 303677 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r303677 | jpeeler | 2011-01-25 10:59:28 -0600 (Tue, 25 Jan 2011) | 26 lines

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

    ........
      r303676 | jpeeler | 2011-01-25 10:58:29 -0600 (Tue, 25 Jan 2011) | 20 lines

      Fix voicemail sequencing for file based storage.

      A previous change was made to account for when the number of voicemail messages
      exceeds the max limit to be handled properly, but it caused gaps in the messages
      to not be properly handled. This has now been resolved.

      In later non 1.4 branches, it appears that resequencing wasn't even occurring
      due from what appears and accidental code removal.

      (closes issue #18498)
      Reported by: JJCinAZ
      Patches:
            bug18498v2.patch uploaded by jpeeler (license 325)

      (closes issue #18486)
      Reported by: bluefox
      Patches:
            bug18486.patch uploaded by jpeeler (license 325)
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303679 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Use unsigned char in comparison for UTF8 check to quiet a compiler warning.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303638 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 303549 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303549 | russell | 2011-01-24 14:51:37 -0600 (Mon, 24 Jan 2011) | 45 lines

  Merged revisions 303548 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r303548 | russell | 2011-01-24 14:49:53 -0600 (Mon, 24 Jan 2011) | 38 lines

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

    ........
      r303546 | russell | 2011-01-24 14:32:21 -0600 (Mon, 24 Jan 2011) | 31 lines

      Fix channel redirect out of MeetMe() and other issues with channel softhangup.

      Mantis issue #18585 reports that a channel redirect out of MeetMe() stopped
      working properly.  This issue includes a patch that resolves the issue by
      removing a call to ast_check_hangup() from app_meetme.c.  I left that in my
      patch, as it doesn't need to be there.  However, the rest of the patch fixes
      this problem with or without the change to app_meetme.

      The key difference between what happens before and after this patch is the
      effect of the END_OF_Q control frame.  After END_OF_Q is hit in ast_read(),
      ast_read() will return NULL.  With the ast_check_hangup() removed, app_meetme
      sees this which causes it to exit as intended.  Checking ast_check_hangup()
      caused app_meetme to exit earlier in the process, and the target of the
      redirect saw the condition where ast_read() returned NULL.

      Removing ast_check_hangup() works around the issue in app_meetme, but doesn't
      solve the issue if another application did the same thing.  There are also
      other edge cases where if an application finishes at the same time that a
      redirect happens, the target of the redirect will think that the channel hung
      up.  So, I made some changes in pbx.c to resolve it at a deeper level.  There
      are already places that unset the SOFTHANGUP_ASYNCGOTO flag in an attempt to
      abort the hangup process.  My patch extends this to remove the END_OF_Q frame
      from the channel's read queue, making the "abort hangup" more complete.  This
      same technique was used in every place where a softhangup flag was cleared.

      (closes issue #18585)
      Reported by: oej
      Tested by: oej, wedhorn, russell

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303551 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Add gsm-devel as a package to install on redhat based systems.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303547 65c4cc65-6c06-0410-ace0-fbb531ad65f3

According to section 19.1.2 of RFC 3261:

  For each component, the set of valid BNF expansions defines exactly
  which characters may appear unescaped.  All other characters MUST be
  escaped.

This patch modifies ast_uri_encode() to encode strings in line with this recommendation.  This patch also adds an ast_escape_quoted() function which escapes '"' and '\' characters in quoted strings in accordance with section 25.1 of RFC 3261.  The ast_uri_encode() function has also been modified to take an ast_flags struct describing the set of rules it should use when escaping characters to allow for it to escape SIP URIs in addition to HTTP URIs and other types of URIs or variations of those two URI types in the future.

The ast_uri_decode() function has also been modified to accept an ast_flags struct describing the set of rules to use when decoding to enable decoding '+' as ' ' in legacy http URLs.

The unit tests for these functions have also been updated.

ABE-2705

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303509 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 303467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303467 | qwell | 2011-01-24 11:20:03 -0600 (Mon, 24 Jan 2011) | 22 lines

  Merged revisions 303285 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r303285 | qwell | 2011-01-21 15:48:09 -0600 (Fri, 21 Jan 2011) | 15 lines

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

    ........
      r303284 | qwell | 2011-01-21 15:45:34 -0600 (Fri, 21 Jan 2011) | 8 lines

      Reset configuration before parsing users.conf.

      Some values configured in chan_dahdi.conf were able to leak in to users.conf
      configuration.  This was surprising users, and potentially setting non-sane
      "defaults".

      ASTNOW-125
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303468 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Revert default compiler change.

If someone wishes to do so, it is trivial to set your own default when running
the configure script.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303418 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Temporarily revert r303288

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303376 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 303286 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303286 | qwell | 2011-01-21 15:50:11 -0600 (Fri, 21 Jan 2011) | 22 lines

  Merged revisions 303285 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r303285 | qwell | 2011-01-21 15:48:09 -0600 (Fri, 21 Jan 2011) | 15 lines

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

    ........
      r303284 | qwell | 2011-01-21 15:45:34 -0600 (Fri, 21 Jan 2011) | 8 lines

      Reset configuration before parsing users.conf.

      Some values configured in chan_dahdi.conf were able to leak in to users.conf
      configuration.  This was surprising users, and potentially setting non-sane
      "defaults".

      ASTNOW-125
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303288 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Really use llvm-gcc, when available.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303235 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Add DB_KEYS.

Discussion on #asterisk on 2011-01-19:
(02:07:03 PM) boch: i wonder how to cycle all entries in a tree
(02:07:11 PM) leifmadsen: use While()
(02:07:17 PM) leifmadsen: you need to know the tree structure already though
(02:07:36 PM) boch: what you mean?
(02:09:02 PM) leifmadsen: you need to know the structure prior to looping, because you can't just return the structure from the dialplan
(02:09:43 PM) leifmadsen: the only way I can think of doing that is via something like writing the output of: asterisk -rx "database show" to a file, then looping through that to know the structure of the database and check everything
(02:09:59 PM) leifmadsen: but at that point you're better off just using either a relational database or an external script
(02:10:13 PM) boch: for example i need to know all entries in the tree
(02:10:15 PM) boch: got it
(02:10:20 PM) leifmadsen: exactly
(02:10:22 PM) leifmadsen: that's the problem
(02:10:22 PM) boch: thank you
(02:13:09 PM) mateu: yeah, i'm surprised there isn't something from the dialplan like 'database show family' so one can get all keys in a family to loop over.
(02:15:35 PM) leifmadsen: database shows everything
(02:16:22 PM) mateu: i mean something from the dial plan that mimics 'database show <family>'
(02:16:41 PM) leifmadsen: guess no one has found that important enough to program :)
(02:16:52 PM) leifmadsen: at that point you should probably just use a relational database...
(02:17:10 PM) mateu: i dunno
(02:17:16 PM) mateu: seems pretty basic to me.
(02:17:16 PM) leifmadsen: me either
(02:17:19 PM) leifmadsen: sure does
(02:17:24 PM) leifmadsen: no one has programmed it though
(02:17:28 PM) ***leifmadsen shrugs
(02:17:43 PM) mateu: ok, well at least we know how it currently stands. thanks leifmadsen
(02:28:52 PM) Corydon76-home: leifmadsen: something like HASHKEYS() ?
(02:30:11 PM) leifmadsen: Corydon76-home: ummm, I was thinking more like DUNDI_QUERY() and DUNDI_RESULT()
(02:30:31 PM) leifmadsen: although HASHKEYS() might work
(02:30:58 PM) leifmadsen: actually ya, looking at it, similar to HASHKEYS()
(02:31:01 PM) leifmadsen: DBKEYS() I guess?
(02:31:45 PM) Corydon76-home: So with no argument, retrieves families, with an argument, retrieves keys of that family?
(02:34:02 PM) leifmadsen: ya
(02:34:16 PM) leifmadsen: how would you iterate through layers of them?
(02:34:30 PM) leifmadsen: i.e. family/key/key/key ?
(02:34:43 PM) Corydon76-home: Essentially, yes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303198 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 303153 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303153 | rmudgett | 2011-01-20 14:31:20 -0600 (Thu, 20 Jan 2011) | 22 lines

  Merged revision 303098 from
  https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier

  ..........
    r303098 | rmudgett | 2011-01-20 12:11:45 -0600 (Thu, 20 Jan 2011) | 15 lines

    CC_INTERFACES does not get built correctly with local channels.

    If local channels are used with CCSS, CC_INTERFACES gets garbage prepended
    to it so the CC recall fails.  Also CC_INTERFACES gets "&(null)" appended
    to it.

    * Initialize the buffer to eliminate the prepended garbage.

    * Filter out the empty interface strings to eliminate the latter.

    * Added a diagnostic message if the CC_INTERFACES is ever empty.

    JIRA ABE-2740
    JIRA SWP-2848
  ..........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303154 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 303107 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303107 | sruffell | 2011-01-20 13:57:31 -0600 (Thu, 20 Jan 2011) | 23 lines

  Merged revisions 303106 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r303106 | sruffell | 2011-01-20 13:56:34 -0600 (Thu, 20 Jan 2011) | 15 lines

    main/features: Use POLLPRI when waiting for events on parked channels.

    This change resolves a regression in the 1.6.2 when converting from
    select to poll.  The DAHDI timers use POLLPRI to indicate that the timer
    fired, but features was not waiting for that flag.  The result was no
    audio for MOH when a call was parked and res_timing_dahdi was in use.

    This patch is slightly modified from the one on the mantis issue.  It does
    not set an exception on the channel if the POLLPRI flag is set.

    (closes issue #18262)
    Reported by: francesco_r
    Patches:
          patch_park_moh-trunk-2.txt uploaded by cjacobsen (license 1029)
          Tested by: francesco_r, rfrantik, one47
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303108 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 303009 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303009 | jpeeler | 2011-01-20 11:10:32 -0600 (Thu, 20 Jan 2011) | 21 lines

  Merged revisions 303008 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r303008 | jpeeler | 2011-01-20 11:07:44 -0600 (Thu, 20 Jan 2011) | 14 lines

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

    ........
      r303007 | jpeeler | 2011-01-20 11:04:08 -0600 (Thu, 20 Jan 2011) | 8 lines

      Add new queue strategy to preserve behavior for when queue members moved to ao2.

      Add queue strategy called "rrordered" to mimic old behavior from when queue
      members were stored in a linked list.

      ABE-2707
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303011 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302921 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302921 | russell | 2011-01-20 10:12:15 -0600 (Thu, 20 Jan 2011) | 9 lines

  Merged revisions 302920 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302920 | russell | 2011-01-20 10:11:58 -0600 (Thu, 20 Jan 2011) | 2 lines

    Resolve a compiler warning.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302922 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302918 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302918 | lmadsen | 2011-01-20 09:45:39 -0600 (Thu, 20 Jan 2011) | 16 lines

  Merged revisions 302917 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302917 | lmadsen | 2011-01-20 09:42:05 -0600 (Thu, 20 Jan 2011) | 8 lines

    Option L() is milliseconds, not seconds.
    > Change the verbose output of option L() to say milliseconds and not seconds
    > as the value is in milliseconds.
    >
    > (closes issue #18264)
    > Reported by: jacco
    > Patches:
    >       app_dial_patch.txt uploaded by lmadsen (license 10)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302919 65c4cc65-6c06-0410-ace0-fbb531ad65f3

On systems which have LLVM, use that compiler. Should result in a massive speed increase.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302879 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302837 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
r302837 | russell | 2011-01-19 17:56:48 -0600 (Wed, 19 Jan 2011) | 2 lines

Only check container count if it exists.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302838 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Clarify a source comment about configuration template categories.

(closes issue #18578)
Reported by: astmiv
Patches:
asterisk.main.config.2.patch uploaded by astmiv (license 1189)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302836 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302834 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302834 | seanbright | 2011-01-19 18:49:00 -0500 (Wed, 19 Jan 2011) | 14 lines

  Merged revisions 302833 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302833 | seanbright | 2011-01-19 18:47:22 -0500 (Wed, 19 Jan 2011) | 7 lines

    Support greetingsfolder as documented in voicemail.conf.sample.

    (closes issue #17870)
    Reported by: edhorton
    Patches:
          __20100816-app_voicemail-greetingsfolder-support.txt uploaded by lmadsen (license 10)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302835 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302831 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
r302831 | pabelanger | 2011-01-19 18:29:45 -0500 (Wed, 19 Jan 2011) | 2 lines

Add binutils-dev for BETTER_BACKTRACES
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302832 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302789 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302789 | russell | 2011-01-19 17:06:46 -0600 (Wed, 19 Jan 2011) | 11 lines

  Merged revisions 302788 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302788 | russell | 2011-01-19 17:06:14 -0600 (Wed, 19 Jan 2011) | 4 lines

    Turn a noisy verbose message into a debug message.

    This can drown your console if you're using the AMI over HTTP.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302790 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302785 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302785 | russell | 2011-01-19 16:35:15 -0600 (Wed, 19 Jan 2011) | 15 lines

  Resolve a memory leak with the manager interface is disabled.

  The intent of this check as it stands in previous versions of Asterisk was to
  check if there are any active sessions.  If there were no sessions, then the
  function would return immediately and not bother with queueing up the manager
  event to be processed.  Since the conversion of storing sessions in an astobj2
  container, this check will always pass.  I changed it to go back to checking
  what was intended.

  The side effect of this was that if the AMI is disabled, the manager event
  queue is populated anyway, but the code that runs to clear out the queue
  never runs.  A producer with no consumer is a bad thing.

  Reported internally by kmorgan.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302786 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302713 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302713 | rmudgett | 2011-01-19 15:29:22 -0600 (Wed, 19 Jan 2011) | 29 lines

  Merged revisions 302693 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r302693 | rmudgett | 2011-01-19 15:25:41 -0600 (Wed, 19 Jan 2011) | 22 lines

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

    ........
      r302671 | rmudgett | 2011-01-19 15:21:56 -0600 (Wed, 19 Jan 2011) | 15 lines

      DTMF transfer plays the wrong sounds for wrong number or other call failure.

      * Set the default for features.conf.sample xferfailsound option to "beeperr"
      as documented instead of "pbx-invalid" and corrected the use of it in DTMF
      blind transfer (#1).

      * Improved DTMF blind transfer handling of wrong numbers.

      Most of the concerns in this issue were taken care of by the patch for
      issue 17999: Issues with DTMF triggered attended transfers.

      (closes issue #18379)
      Reported by: gincantalupo
      Tested by: rmudgett
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302732 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302680 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302680 | tilghman | 2011-01-19 15:23:31 -0600 (Wed, 19 Jan 2011) | 16 lines

  Merged revisions 302675 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r302675 | tilghman | 2011-01-19 15:22:45 -0600 (Wed, 19 Jan 2011) | 9 lines

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

    ........
      r302663 | tilghman | 2011-01-19 15:20:28 -0600 (Wed, 19 Jan 2011) | 2 lines

      Add some API documentation
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302686 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302634 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302634 | tilghman | 2011-01-19 14:24:57 -0600 (Wed, 19 Jan 2011) | 22 lines

  Merged revisions 302599 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302599 | tilghman | 2011-01-19 14:13:24 -0600 (Wed, 19 Jan 2011) | 15 lines

    Kill zombies.

    When we ast_safe_fork() with a non-zero argument, we're expected to reap our
    own zombies.  On a zero argument, however, the zombies are only reaped when
    there aren't any non-zero forked children alive.  At other times, we
    accumulate zombies.  This code is forward ported from res_agi in 1.4, so that
    forked children are always reaped, thus preventing an accumulation of zombie
    processes.

    (closes issue #18515)
    Reported by: ernied
    Patches:
          20101221__issue18515.diff.txt uploaded by tilghman (license 14)
    Tested by: ernied
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302644 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302600 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
r302600 | qwell | 2011-01-19 14:14:40 -0600 (Wed, 19 Jan 2011) | 1 line

Fix typo pointed out on asterisk-users list.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302601 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302555 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302555 | seanbright | 2011-01-19 14:03:32 -0500 (Wed, 19 Jan 2011) | 14 lines

  Merged revisions 302554 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302554 | seanbright | 2011-01-19 14:02:29 -0500 (Wed, 19 Jan 2011) | 7 lines

    Don't call strlen() when we only need to look at the next character or two.

    (closes issue #18042)
    Reported by: wdoekes
    Patches:
          astsvn-inefficient-ast-uri-decode.patch uploaded by wdoekes (license 717)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302556 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302552 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302552 | seanbright | 2011-01-19 13:54:47 -0500 (Wed, 19 Jan 2011) | 14 lines

  Merged revisions 302551 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302551 | seanbright | 2011-01-19 13:54:03 -0500 (Wed, 19 Jan 2011) | 7 lines

    Remove an extraneous \r\n at the end of a parking manager events.

    (closes issue #18363)
    Reported by: clegall_proformatique
    Patches:
          asterisk_1.8_295998_parking_manager_events_format.patch uploaded by clegall proformatique (license 1139)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302553 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302549 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302549 | seanbright | 2011-01-19 13:43:11 -0500 (Wed, 19 Jan 2011) | 17 lines

  Merged revisions 302548 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302548 | seanbright | 2011-01-19 13:37:09 -0500 (Wed, 19 Jan 2011) | 10 lines

    Properly handle partial reads from fgets() when handling AGIs.

    When fgets() failed with EAGAIN, we were continually decrementing the available
    space left in our buffer, resulting in botched command handling.

    (closes issue #16032)
    Reported by: notahat
    Patches:
          agi_buffer_patch2.diff uploaded by fnordian (license 110)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302550 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302505 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302505 | seanbright | 2011-01-19 12:58:11 -0500 (Wed, 19 Jan 2011) | 14 lines

  Merged revisions 302504 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302504 | seanbright | 2011-01-19 12:56:32 -0500 (Wed, 19 Jan 2011) | 7 lines

    Make sure that h_length is set when we short-circuit out of ast_gethostbyname.

    (closes issue #16135)
    Reported by: thedavidfactor
    Patches:
          utils.patch uploaded by thedavidfactor (license 903)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302507 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302462 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302462 | pabelanger | 2011-01-19 12:09:35 -0500 (Wed, 19 Jan 2011) | 9 lines

  Merged revisions 302461 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302461 | pabelanger | 2011-01-19 12:08:01 -0500 (Wed, 19 Jan 2011) | 2 lines

    Handle 'Resource temporarily unavailable' error more gracefully.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302463 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302417 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302417 | seanbright | 2011-01-19 10:53:20 -0500 (Wed, 19 Jan 2011) | 16 lines

  Merged revisions 302416 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302416 | seanbright | 2011-01-19 10:52:44 -0500 (Wed, 19 Jan 2011) | 9 lines

    Remove references to priorityjumping from the sample extensions.conf.

    Priority jumping was removed from pbx_config in r68970.

    (closes issue #18622)
    Reported by: kshumard
    Patches:
          extensions.conf.sample.patch uploaded by kshumard (license 92)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302418 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302414 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302414 | seanbright | 2011-01-19 10:45:17 -0500 (Wed, 19 Jan 2011) | 7 lines

  Initialize an uninitialized variable.

  (closes issue #18640)
  Reported by: jcovert
  Patches:
        chan_sip.c.patch uploaded by jcovert (license 551)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302415 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302412 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302412 | seanbright | 2011-01-19 10:31:39 -0500 (Wed, 19 Jan 2011) | 10 lines

  Use appropriate type for requested format in chan_local.

  We were passing and storing the requested format as an int instead of format_t
  resulting in truncation.

  (closes issue #18238)
  Reported by: whizemen
  Patches:
        0018238_speex16.patch uploaded by whizemen (license 1143)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302413 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302318 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
r302318 | rmudgett | 2011-01-18 16:04:14 -0600 (Tue, 18 Jan 2011) | 1 line

Use the expanded format type instead of plain int.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302319 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302314 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302314 | mnicholson | 2011-01-18 15:43:21 -0600 (Tue, 18 Jan 2011) | 18 lines

  Merged revisions 302313 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r302313 | mnicholson | 2011-01-18 15:40:03 -0600 (Tue, 18 Jan 2011) | 11 lines

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

    ........
      r302311 | mnicholson | 2011-01-18 15:35:03 -0600 (Tue, 18 Jan 2011) | 4 lines

      URI encode the user part of the contact header.

      ABE-2705
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302315 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302266 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302266 | jpeeler | 2011-01-18 14:19:57 -0600 (Tue, 18 Jan 2011) | 34 lines

  Merged revisions 302265 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302265 | jpeeler | 2011-01-18 14:13:52 -0600 (Tue, 18 Jan 2011) | 27 lines

    Convert device state callbacks to ao2 objects to fix a deadlock in chan_sip.

    Lock scenario presented here:
    Thread 1
     holds ast_rdlock_contexts &conlock
     holds handle_statechange hints
     holds handle_statechange hint
      waiting for cb_extensionstate
       Locked Here: chan_sip.c line 7428 (find_call)
    Thread 2
     holds handle_request_do &netlock
     holds find_call sip_pvt_ptr
      waiting for ast_rdlock_contexts &conlock
       Locked Here: pbx.c line 9911 (ast_rdlock_contexts)

    Chan_sip has an established locking order of locking the sip_pvt and then
    getting the context lock. So the as stated by the summary, the operations in
    thread 2 have been modified to no longer require the context lock.

    (closes issue #18310)
    Reported by: one47
    Patches:
          statecbs_ao2.mk2.patch uploaded by one47 (license 23),
          modified by me

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302270 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302267 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302267 | russell | 2011-01-18 14:19:57 -0600 (Tue, 18 Jan 2011) | 5 lines

  Don't enable AO2_DEBUG by default if AST_DEVMODE is on.

  AO2_DEBUG is not important and is causing a false compiler warning to be
  generated on my Ubuntu Natty dev box.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302268 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302174 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302174 | rmudgett | 2011-01-18 12:11:43 -0600 (Tue, 18 Jan 2011) | 102 lines

  Merged revisions 302173 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r302173 | rmudgett | 2011-01-18 12:07:15 -0600 (Tue, 18 Jan 2011) | 95 lines

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

    ........
      r302172 | rmudgett | 2011-01-18 12:04:36 -0600 (Tue, 18 Jan 2011) | 88 lines

      Issues with DTMF triggered attended transfers.

      Issue #17999
      1) A calls B. B answers.
      2) B using DTMF dial *2 (code in features.conf for attended transfer).
      3) A hears MOH. B dial number C
      4) C ringing. A hears MOH.
      5) B hangup. A still hears MOH. C ringing.
      6) A hangup. C still ringing until "atxfernoanswertimeout" expires.
      For v1.4 C will ring forever until C answers the dead line. (Issue #17096)

      Problem: When A and B hangup, C is still ringing.

      Issue #18395
      SIP call limit of B is 1
      1. A call B, B answered
      2. B *2(atxfer) call C
      3. B hangup, C ringing
      4. Timeout waiting for C to answer
      5. Recall to B fails because B has reached its call limit.

      Because B reached its call limit, it cannot do anything until the transfer
      it started completes.

      Issue #17273
      Same scenario as issue 18395 but party B is an FXS port.  Party B cannot
      do anything until the transfer it started completes.  If B goes back off
      hook before C answers, B hears ringback instead of the expected dialtone.

      **********
      Note for the issue #17273 and #18395 fix:

      DTMF attended transfer works within the channel bridge.  Unfortunately,
      when either party A or B in the channel bridge hangs up, that channel is
      not completely hung up until the transfer completes.  This is a real
      problem depending upon the channel technology involved.

      For chan_dahdi, the channel is crippled until the hangup is complete.
      Either the channel is not useable (analog) or the protocol disconnect
      messages are held up (PRI/BRI/SS7) and the media is not released.

      For chan_sip, a call limit of one is going to block that endpoint from any
      further calls until the hangup is complete.

      For party A this is a minor problem.  The party A channel will only be in
      this condition while party B is dialing and when party B and C are
      conferring.  The conversation between party B and C is expected to be a
      short one.  Party B is either asking a question of party C or announcing
      party A.  Also party A does not have much incentive to hangup at this
      point.

      For party B this can be a major problem during a blonde transfer.  (A
      blonde transfer is our term for an attended transfer that is converted
      into a blind transfer.  :)) Party B could be the operator.  When party B
      hangs up, he assumes that he is out of the original call entirely.  The
      party B channel will be in this condition while party C is ringing, while
      attempting to recall party B, and while waiting between call attempts.

      WARNING:
      The ATXFER_NULL_TECH conditional is a hack to fix the problem.  It will
      replace the party B channel technology with a NULL channel driver to
      complete hanging up the party B channel technology.  The consequences of
      this code is that the 'h' extension will not be able to access any channel
      technology specific information like SIP statistics for the call.

      ATXFER_NULL_TECH is not defined by default.
      **********

      (closes issue #17999)
      Reported by: iskatel
      Tested by: rmudgett
      JIRA SWP-2246

      (closes issue #17096)
      Reported by: gelo
      Tested by: rmudgett
      JIRA SWP-1192

      (closes issue #18395)
      Reported by: shihchuan
      Tested by: rmudgett

      (closes issue #17273)
      Reported by: grecco
      Tested by: rmudgett

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302178 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 293493 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293493 | twilson | 2010-11-01 09:58:00 -0500 (Mon, 01 Nov 2010) | 14 lines

  Only offer codecs both sides support for directmedia

  When using directmedia, Asterisk needs to limit the codecs offered to just
  the ones that both sides recognize, otherwise they may end up sending audio
  that the other side doesn't understand.

  (closes issue #17403)
  Reported by: one47
  Patches:
        sip_codecs_simplified4 uploaded by one47 (license 23)
  Tested by: one47, falves11

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302048 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 302005 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
r302005 | twilson | 2011-01-17 09:04:59 -0600 (Mon, 17 Jan 2011) | 2 lines

Document "encryption" option in sip.conf.sample
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302006 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301946 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r301946 | rmudgett | 2011-01-14 15:09:57 -0600 (Fri, 14 Jan 2011) | 13 lines

  Deadlock between dahdi_request() and pri_dchannel() processing an incomming call.

  The sig_pri_new_ast_channel() is called with the channel private lock held
  when pri_dchannel() calls it and no channel private lock held when
  dahdi_request() calls it.  The use of pri_grab() in
  sig_pri_new_ast_channel() could leave the channel private lock held when
  it returns if the lock was not held before calling it.

  Make sig_pri_new_ast_channel() just lock the PRI span lock instead of
  using pri_grab().  It is safe to do this because dahdi_request() does not
  have the channel private lock and the deadlock potential with the PRI span
  lock is only between pri_dchannel() and other threads.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301947 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301851 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r301851 | bbryant | 2011-01-14 15:11:55 -0500 (Fri, 14 Jan 2011) | 6 lines

  Changing previous revisions 301845/301847 to use ast_sockaddr_setnull() instead
  of setting the field manually to avoid uninitialized data.

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301858 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Add relationships to function documentation.

Fix amatuer type mistake

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301850 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301845 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r301845 | bbryant | 2011-01-14 14:35:23 -0500 (Fri, 14 Jan 2011) | 9 lines

  Fix for a consistent MulticastRTP channel driver crash due to use of unitilized
  data.

  (closes issue #18290)
  (closes issue #18602)
  Reported by: voipgate, wybecom

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301847 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Add relationships to function documentation.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301846 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301790 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r301790 | jpeeler | 2011-01-14 11:32:52 -0600 (Fri, 14 Jan 2011) | 42 lines

  Resolve deadlock involving REFER.

  Two fixes:
  1) One must always have the private unlocked before calling
  pbx_builtin_setvar_helper to not invalidate locking order since it locks the
  channel.
  2) Unlock the channel before calling pbx_find_extension, which starts and stops
  autoservice during the lookup. The problem scenario as illustrated by the
  reporter:

  Thread: do_monitor
  -----------------------
  handle_request_do
   handle_incoming
    handle_request_refer
     ast_parking_ext_valid
      pbx_find_extension
       ast_autoservice_stop
        while (chan_list_state == as_chan_list_state) { usleep(1000); }

  Thread: autoservice_run
  -----------------------
  autoservice_run
   chan = ast_waitfor_n
    ast_waitfor_nandfds
     ast_waitfor_nandfds_classic / simple / complex (depending on your system)
      ast_channel_lock(c[x]);

  handle_request_do and schedule_process_request_queue locks the owner
  if it exists. The autoservice thread is waiting for the channel lock, which
  wasn't ever released since the do_monitor thread was waiting for autoservice
  operations to complete. Solved by unlocking the channel but keeping a reference
  to guarantee safety.

  (closes issue #18403)
  Reported by: jthurman
  Patches:
        20110103-blind_deadlock.diff uploaded by jthurman (license 614)
        issue18403.patch uploaded by jpeeler (license 325)
  Tested by: jthurman
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301791 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301731 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301731 | lmadsen | 2011-01-13 11:01:43 -0600 (Thu, 13 Jan 2011) | 15 lines

  Merged revisions 301730 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r301730 | lmadsen | 2011-01-13 11:01:11 -0600 (Thu, 13 Jan 2011) | 7 lines

    Add static entry for split Polycom 332 firmware.

    (closes issue #18607)
    Reported by: cjacobsen
    Patches:
          polycom_331.diff uploaded by cjacobsen (license 1029)
    Tested by: lathama
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301732 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Add dialplan variables for asterisk.conf directories

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301729 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301683 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301683 | twilson | 2011-01-12 15:19:48 -0600 (Wed, 12 Jan 2011) | 15 lines

  Merged revisions 301682 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r301682 | twilson | 2011-01-12 15:05:02 -0600 (Wed, 12 Jan 2011) | 9 lines

    Don't reject all SUBSCRIBE auth requests

    When merging another SUBSCRIBE fix from 1.4, some braces were put in
    the wrong place. This patch fixes that.

    (closes issue #18597)
    Reported by: thsgmbh
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301684 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301595 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301595 | mnicholson | 2011-01-12 12:51:37 -0600 (Wed, 12 Jan 2011) | 22 lines

  Merged revisions 301594 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r301594 | mnicholson | 2011-01-12 12:50:31 -0600 (Wed, 12 Jan 2011) | 15 lines

    Removed a usleep(1) that shouldn't be necessary in session_do, and removed the
    ms_t member from the mansession_session structure.

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

    ........
      r301591 | mnicholson | 2011-01-12 12:39:03 -0600 (Wed, 12 Jan 2011) | 5 lines

      Don't store the thread id for the manager session in the structure we pass to
      the thread for the manager session.

      ABE-2543
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301596 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301504 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301504 | jpeeler | 2011-01-12 12:12:08 -0600 (Wed, 12 Jan 2011) | 26 lines

  Merged revisions 301503 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r301503 | jpeeler | 2011-01-12 12:11:49 -0600 (Wed, 12 Jan 2011) | 19 lines

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

    ........
      r301502 | jpeeler | 2011-01-12 12:10:42 -0600 (Wed, 12 Jan 2011) | 12 lines

      Fix CPU spike when pressing DTMF after agent login.

      The problem here is that DTMF was being continuously deferred and requeued
      since ast_safe_sleep is called in a loop. There are serveral other places in the
      code that sleeps and then loops in a similar fashion. Because of this fact I
      opted to not defer DTMF any more, which will not affect the original fix:

      https://reviewboard.asterisk.org/r/674

      (closes issue #18130)
      Reported by: rgj
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301505 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301446 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
r301446 | dvossel | 2011-01-12 10:05:12 -0600 (Wed, 12 Jan 2011) | 2 lines

Removal of unused variables so Asterisk will compile.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301447 65c4cc65-6c06-0410-ace0-fbb531ad65f3

fix wrong text of rerun menuselect after user interface warning

the warning, if no user interface for menuselect warning was found is not right.
you have to rerun configure before make menuselect after installing a proper user interface.

(closes issue 0018594)
Reported by: Dovid

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301445 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301402 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r301402 | tilghman | 2011-01-11 18:26:39 -0600 (Tue, 11 Jan 2011) | 7 lines

  Call execl() directly for a better solution for paths with spaces.

  (closes issue #18600)
  Reported by: ebroad
  Patches:
        20110111__issue18600__2.diff.txt uploaded by tilghman (license 14)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301403 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301311 | pabelanger | 2011-01-11 14:16:06 -0500 (Tue, 11 Jan 2011) | 9 lines

  Merged revisions 301310 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r301310 | pabelanger | 2011-01-11 14:14:31 -0500 (Tue, 11 Jan 2011) | 2 lines

    Fix a logic issue when passing context ARG
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301319 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301308 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301308 | mnicholson | 2011-01-11 12:51:40 -0600 (Tue, 11 Jan 2011) | 18 lines

  Merged revisions 301307 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r301307 | mnicholson | 2011-01-11 12:42:05 -0600 (Tue, 11 Jan 2011) | 11 lines

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

    ........
      r301305 | mnicholson | 2011-01-11 12:34:40 -0600 (Tue, 11 Jan 2011) | 4 lines

      Prevent buffer overflows in ast_uri_encode()

      ABE-2705
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301309 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301263 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r301263 | tilghman | 2011-01-10 16:39:31 -0600 (Mon, 10 Jan 2011) | 8 lines

  Little endian machines were not converted properly.

  (closes issue #18583)
  Reported by: jcovert
  Patches:
        20110110__issue18583.diff.txt uploaded by tilghman (license 14)
  Tested by: jcovert
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301264 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301221 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301221 | pabelanger | 2011-01-09 16:40:34 -0500 (Sun, 09 Jan 2011) | 21 lines

  Merged revisions 301220 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r301220 | pabelanger | 2011-01-09 16:38:24 -0500 (Sun, 09 Jan 2011) | 14 lines

    SOUND_CACHE_DIR now defaults to empty

    Sounds files included in the Asterisk tarball were being ignored and
    re-downloaded.  Users wanting to cache the files can still override the setting
    using the --with-sounds-cache option.

    (closes issue #18589)
    Reported by: pabelanger
    Patches:
          issue18589.patch uploaded by pabelanger (license 224)
          Tested by: pabelanger

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301222 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301177 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301177 | pabelanger | 2011-01-08 17:00:12 -0500 (Sat, 08 Jan 2011) | 14 lines

  Merged revisions 301176 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r301176 | pabelanger | 2011-01-08 16:58:24 -0500 (Sat, 08 Jan 2011) | 7 lines

    Indicate log level argument for Log() is not optional

    (closes issue #18586)
    Reported by: kshumard
    Patches:
          app_verbose.c.patch uploaded by kshumard (license 92)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301178 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301134 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r301134 | rmudgett | 2011-01-07 19:11:31 -0600 (Fri, 07 Jan 2011) | 7 lines

  The DTMF attended transfer feature cannot callback a chan_dahdi BRI phone.

  The DAHDI ISDN channel name is not dialable.

  Make a channel name like DAHDI/i3/400-12 dialable when the sequence number
  is stripped off of the name.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301135 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301090 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301090 | qwell | 2011-01-07 14:53:02 -0600 (Fri, 07 Jan 2011) | 15 lines

  Merged revisions 301089 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r301089 | qwell | 2011-01-07 14:52:00 -0600 (Fri, 07 Jan 2011) | 8 lines

    Initialize useropts/adminopts in case there is no column in the realtime DB.

    (closes issue #18182)
    Reported by: dimas
    Patches:
          v1-18182.patch uploaded by dimas (license 88)
    Tested by: dimas
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301091 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 301047 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301047 | jpeeler | 2011-01-07 13:58:30 -0600 (Fri, 07 Jan 2011) | 15 lines

  Merged revisions 301046 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r301046 | jpeeler | 2011-01-07 13:57:42 -0600 (Fri, 07 Jan 2011) | 8 lines

    Fix regression causing forwarding voicemails to not work with file storage.

    I had actually already fixed this in 295200 in 1.4 and thought it wasn't
    missing in the other branches for some reason.

    (closes issue #18358)
    Reported by: cabal95
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301048 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Oops, missed the actual decoding part.

(closes issue #18046)
Reported by: wdoekes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301008 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300955 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300955 | jpeeler | 2011-01-07 11:24:14 -0600 (Fri, 07 Jan 2011) | 21 lines

  Merged revisions 300951 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r300951 | jpeeler | 2011-01-07 11:23:37 -0600 (Fri, 07 Jan 2011) | 14 lines

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

    ........
      r300918 | jpeeler | 2011-01-07 11:13:21 -0600 (Fri, 07 Jan 2011) | 7 lines

      Ensure good bye prompt in voicemail is played at the correct time.

      Specifically in the case of timing out but not leaving voicemail nothing
      should be heard. And when leaving voicemail it should be heard.

      ABE-2647
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300959 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Added support for postgres database retry query on disconnection to res_config_pgsql

If your postgres connection died suddenly in between res_config_pgsql
queries, the next query will fail because the query is executed on a
disconnected/disconnecting handle. The query is abandoned and is
returned from in error.

Now we will reconnect and try again if a query was run on a
disconnected connection.

(closes issue #18071)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300882 65c4cc65-6c06-0410-ace0-fbb531ad65f3

XML validation

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300841 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Add a hashcompat mode called "legacy", which translates a literal plus sign to a space.

(closes issue #18046)
Reported by: wdoekes
Patches:
20100930__issue18046.diff.txt uploaded by tilghman (license 14)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300840 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300798 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r300798 | tilghman | 2011-01-06 00:28:18 -0600 (Thu, 06 Jan 2011) | 8 lines

  Don't destroy handle not created by use (because the caller will).

  (closes issue #18526)
   Reported by: makoto
   Patches:
         res-config-mysql-include.patch uploaded by makoto (license 38)
   Tested by: makoto
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300799 65c4cc65-6c06-0410-ace0-fbb531ad65f3

update safe_asterisk script

change defaults to make a little more sense. Default log location is now asterisk log location and default email notification has been changed to root on the local machine

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300761 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300714 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300714 | rmudgett | 2011-01-05 14:54:21 -0600 (Wed, 05 Jan 2011) | 21 lines

  Merged revision 300711 from
  https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier

  ..........
    r300711 | rmudgett | 2011-01-05 13:43:55 -0600 (Wed, 05 Jan 2011) | 14 lines

    A call retrieved from hold may wind up with no audio.

    If the retrieved call is natively bridged then the call may not have any
    audio path.  The following warning message is given:
    "Failed to add <dfd> to conference <chan>/<chan>: Invalid argument".

    * Open the media on a B channel when pri_fixup_principle() moves the call
    from a no_b_channel channel to a real channel.

    * Added lock protection while pri_fixup_principle() moves a call from one
    private structure to another.

    * Made some pri_fixup_principle() messages more meaningful.
  ..........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300716 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300623 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300623 | tilghman | 2011-01-05 12:56:12 -0600 (Wed, 05 Jan 2011) | 24 lines

  Merged revisions 300622 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r300622 | tilghman | 2011-01-05 12:54:58 -0600 (Wed, 05 Jan 2011) | 17 lines

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

    ........
      r300621 | tilghman | 2011-01-05 12:47:46 -0600 (Wed, 05 Jan 2011) | 10 lines

      Use the sanity check in place of the disconnect/connect cycle.

      The disconnect/connect cycle has the potential to cause random crashes.

      (closes issue #18243)
       Reported by: ks3
       Patches:
             res_odbc.patch uploaded by ks3 (license 1147)
       Tested by: ks3
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300624 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300575 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300575 | pabelanger | 2011-01-05 11:29:19 -0500 (Wed, 05 Jan 2011) | 13 lines

  Merged revisions 300574 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r300574 | pabelanger | 2011-01-05 11:28:07 -0500 (Wed, 05 Jan 2011) | 6 lines

    Change deprecated message to LOG_WARNING

    Also removed latter part of message

    Discussed on #asterisk-dev
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300576 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300521 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300521 | lmadsen | 2011-01-04 15:53:27 -0600 (Tue, 04 Jan 2011) | 17 lines

  Merged revisions 300520 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r300520 | lmadsen | 2011-01-04 15:52:41 -0600 (Tue, 04 Jan 2011) | 9 lines

    Fix backwards and broken XML documentation.

    (closes issue #18547)
    Reported by: jcovert
    Patches:
          xmldoc.c.patch uploaded by jcovert (license 551)
          chan_iax2.c.doc.patch uploaded by jcovert (license 551)
          chan_sip.c.patch uploaded by jcovert (license 551)
          chan_agent.c.patch uploaded by jcovert (license 551)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300522 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300433 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300433 | lmadsen | 2011-01-04 15:00:55 -0600 (Tue, 04 Jan 2011) | 15 lines

  Merged revisions 300431 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r300431 | lmadsen | 2011-01-04 15:00:29 -0600 (Tue, 04 Jan 2011) | 7 lines

    Add some documentation to users.conf.sample.

    (closes issue #18531)
    Reported by: lathama
    Patches:
          users.conf.sample2.diff uploaded by lathama (license 1028)
    Tested by: lathama
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300434 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300430 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300430 | russell | 2011-01-04 15:00:16 -0600 (Tue, 04 Jan 2011) | 18 lines

  Merged revisions 300429 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r300429 | russell | 2011-01-04 14:59:56 -0600 (Tue, 04 Jan 2011) | 11 lines

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

    ........
      r300428 | russell | 2011-01-04 14:56:04 -0600 (Tue, 04 Jan 2011) | 4 lines

      Update the autosupport script from Digium support.

      (closes AST-395)
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300432 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300384 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r300384 | lmadsen | 2011-01-04 13:45:22 -0600 (Tue, 04 Jan 2011) | 7 lines

  Update STAT() to use the comma instead of the pipe.

  (closes issue #18503)
  Reported by: cjacobsen
  Patches:
        old_separator.diff uploaded by cjacobsen (license 1029)
  Tested by: lathama
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300385 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Update MFC-R2 code to use new DTMF-R2 functionality in OpenR2
(closes issue #18576)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300345 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300301 | twilson | 2011-01-04 11:54:41 -0600 (Tue, 04 Jan 2011) | 29 lines

  Merged revisions 300298 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r300298 | twilson | 2011-01-04 11:37:26 -0600 (Tue, 04 Jan 2011) | 22 lines

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

    ........
      r300216 | twilson | 2011-01-04 11:11:48 -0600 (Tue, 04 Jan 2011) | 15 lines

      Don't authenticate SUBSCRIBE re-transmissions

      This only skips authentication on retransmissions that are already
      authenticated. A similar method is already used for INVITES. This
      is the kind of thing we end up having to do when we don't have a
      transaction layer...

      (closes issue #18075)
      Reported by: mdu113
      Patches:
            diff.txt uploaded by twilson (license 396)
      Tested by: twilson, mdu113

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300302 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300214 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r300214 | pitel | 2011-01-04 18:01:52 +0100 (Út, 04 led 2011) | 7 lines

  Memory leaking in calendars

  ne_request_destroy() was missing in icalendar and exchange calendar modules, causing memory leak.

  (closes issue #18521)
  Review: https://reviewboard.asterisk.org/r/1068/
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300215 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Optional HOLD/RETRIEVE signaling for PTMP TE when the bridge goes on and off hold.

Added the moh_signaling option to specify what to do when the channel's
bridged peer puts the ISDN channel on and off of hold.

Implemented as a FSM to control libpri ISDN signaling when the bridged
peer places the channel on and off of hold with the AST_CONTROL_HOLD and
AST_CONTROL_UNHOLD control frames.

JIRA SWP-2687
JIRA ABE-2691

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300212 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300166 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300166 | rmudgett | 2011-01-03 17:14:55 -0600 (Mon, 03 Jan 2011) | 11 lines

  Merged revisions 300165 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r300165 | rmudgett | 2011-01-03 17:02:13 -0600 (Mon, 03 Jan 2011) | 4 lines

    Use correct variable for atxfercallbackretries config option.

    * Misc formatting changes.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300168 65c4cc65-6c06-0410-ace0-fbb531ad65f3

initialize playing_silence in struct initialization

playing_silence was not initialized with the struct
was initialized, it was being set after the fact
which caused problems if something that relied on
playing_silence being set was called too quickly

(closes issue #18430)
Reported by: stevebrandli
Patches:
externalivr.patch uploaded by thedavidfactor (license 903)
Tested by: thedavidfactor, stevebrandli

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300121 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 300082 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r300082 | lmadsen | 2011-01-03 07:14:25 -0600 (Mon, 03 Jan 2011) | 11 lines

  Increase side of mapping response field.

  I've increased the size of the response field in a DUNDi mapping because of
  some documentation I'm writing. Previously it was set to AST_MAX_EXTENSION which
  is only 80 characters, which is far too small when you're using some dialplan
  functions to craft a response. The example I'm using is:

  extensions =>
  RegisteredDevices,0,SIP,dundi:very_awesome_password/${IF($[${DB_EXISTS(phones/${NUMBER}/device)}]?${DB(phones/${NUMBER}/device)}:None)},nopartial
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300083 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Support negative filters.

(closes issue #17979)
Reported by: tilghman
Patches:
20100911__for_blitzrage.diff.txt uploaded by tilghman (license 14)
Tested by: lmadsen

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300045 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Support an alternate configuration file for the 'logger reload' command.

(closes issue #17668)
Reported by: tilghman
Patches:
20100718__logger_reload_altconf__2.diff.txt uploaded by tilghman (license 14)

Review: (by lmadsen, russell within comments on issue tracker)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300044 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Remove some trailing whitespace and steal revision 300000.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300000 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 299989 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r299989 | tilghman | 2010-12-29 16:02:59 -0600 (Wed, 29 Dec 2010) | 4 lines

  Quote arguments, just in case there's a space in a pathname.

  (Diagnosed by pabelanger on #asterisk-dev, fixed by me.)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299990 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 299948 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
r299948 | pabelanger | 2010-12-29 14:28:36 -0500 (Wed, 29 Dec 2010) | 2 lines

Only remove /tmp/astdatadir, not /var/lib/asterisk
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299949 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 299907 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
r299907 | pabelanger | 2010-12-29 13:22:23 -0500 (Wed, 29 Dec 2010) | 2 lines

Properly quote varibles for MAC OS X
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299908 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 299865 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r299865 | pabelanger | 2010-12-28 13:53:37 -0500 (Tue, 28 Dec 2010) | 9 lines

  Merged revisions 299864 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r299864 | pabelanger | 2010-12-28 13:51:13 -0500 (Tue, 28 Dec 2010) | 2 lines

    Documentation typo
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299866 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 299820 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
r299820 | tilghman | 2010-12-27 15:23:10 -0600 (Mon, 27 Dec 2010) | 2 lines

More space-in-pathname issues.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299824 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 299794 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
r299794 | tilghman | 2010-12-27 14:41:04 -0600 (Mon, 27 Dec 2010) | 2 lines

Mac OS X spaces-in-pathnames fix.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299795 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Merged revisions 299752 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
r299752 | tilghman | 2010-12-26 15:15:58 -0600 (Sun, 26 Dec 2010) | 2 lines

Properly quote path on Darwin.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299754 65c4cc65-6c06-0410-ace0-fbb531ad65f3