Commit Graph

16051 Commits

Author SHA1 Message Date
Tilghman Lesher
6d0cdb3f22 Merged revisions 134980 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134980 | tilghman | 2008-07-31 16:55:42 -0500 (Thu, 31 Jul 2008) | 16 lines

Blocked revisions 134976 via svnmerge

........
r134976 | tilghman | 2008-07-31 16:53:19 -0500 (Thu, 31 Jul 2008) | 9 lines

Specify codecs in callfiles and manager, to allow video calls to be set up
from callfiles and AMI.
(closes issue #9531)
 Reported by: Geisj
 Patches: 
       20080715__bug9531__1.4.diff.txt uploaded by Corydon76 (license 14)
       20080715__bug9531__1.6.0.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134981 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 21:58:26 +00:00
Tilghman Lesher
2ea9a77dc1 Merged revisions 134977 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134977 | tilghman | 2008-07-31 16:53:59 -0500 (Thu, 31 Jul 2008) | 2 lines

Switch command order, to meet with current specs

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 21:54:47 +00:00
Tilghman Lesher
511ebd6e50 Blocked revisions 134925 via svnmerge
........
r134925 | tilghman | 2008-07-31 15:10:39 -0500 (Thu, 31 Jul 2008) | 3 lines

Increase column size beyond the minimum required, since PostgreSQL won't let
us modify existing columns.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134926 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 20:11:17 +00:00
Steve Murphy
7a26f22be2 Merged revisions 134922 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134922 | murf | 2008-07-31 13:48:08 -0600 (Thu, 31 Jul 2008) | 63 lines

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

........
r134883 | murf | 2008-07-31 13:23:42 -0600 (Thu, 31 Jul 2008) | 51 lines

(closes issue #11849)
Reported by: greyvoip
Tested by: murf

OK, a few days of debugging, a bunch of instrumentation
in chan_sip, main/channel.c, main/pbx.c, etc. and 5 solid 
notebook pages of notes later, I  have made the small
tweek necc. to get the start time right on the second 
CDR when:

  A Calls B
  B answ.
  A hits Xfer button on sip phone,
  A dials C and hits the OK button,
  A hangs up
  C answers ringing phone
  B and C converse
  B and/or C hangs up

But does not harm the scenario where:

  A Calls B
  B answ.
  B hits xfer button on sip phone,
  B dials C and hits the OK button,
  B hangs up
  C answers ringing phone
  A and C converse
  A and/or C hangs up

The difference in start times on the second CDR is because
of a Masquerade on the B channel when the xfer number is 
sent. It ends up replacing the CDR on the B channel with
a duplicate, which ends up getting tossed out. We keep 
a pointer to the first CDR, and update *that* after the
bridge closes. But, only if the CDR has changed.

I hope this change is specific enough not to muck
up any current CDR-based apps. In my defence, I 
assert that the previous information was wrong,
and this change fixes it, and possibly other
similar scenarios.

I wonder if I should be doing the same thing
for the channel, as I did for the peer, but
I can't think of a scenario this might affect.
I leave it, then, as an exersize for the users,
to find the scenario where the chan's CDR 
changes and loses the proper start time.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134923 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:54:58 +00:00
Tilghman Lesher
e1972c6d9d Blocked revisions 134919 via svnmerge
........
r134919 | tilghman | 2008-07-31 14:43:02 -0500 (Thu, 31 Jul 2008) | 6 lines

Two errors:
	1) If a function returns SQLITE_LOCKED, no recovery is possible.
	2) An error message can be allocated, even when no error is signalled.
(closes issue #13109)
 Reported by: gknispel_proformatique

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134920 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:43:38 +00:00
Russell Bryant
a6439b01e2 Merged revisions 134917 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134917 | russell | 2008-07-31 14:39:50 -0500 (Thu, 31 Jul 2008) | 17 lines

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

........
r134915 | russell | 2008-07-31 14:37:26 -0500 (Thu, 31 Jul 2008) | 9 lines

Get app_ices working again

(closes issue #12981)
Reported by: dlogan
Patches:
      20080709__app_ices_v2_update_trunk.diff uploaded by bbryant (license 36)
      20080709__app_ices_v2_update_14.diff uploaded by bbryant (license 36)
Tested by: bbryant

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134918 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:41:11 +00:00
Tilghman Lesher
b346b35ea9 Blocked revisions 134867 via svnmerge
........
r134867 | tilghman | 2008-07-31 14:03:41 -0500 (Thu, 31 Jul 2008) | 4 lines

Optimize frame cache by realloc'ing the smallest frame when the cache is full.
This ensures that we don't just keep a cache of tiny frames, continually doing
an alloc/free for each data frame, thus negating the point of having a cache.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:04:26 +00:00
Russell Bryant
3abfb2c7d4 Merged revisions 134815 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134815 | russell | 2008-07-31 11:50:10 -0500 (Thu, 31 Jul 2008) | 15 lines

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

........
r134814 | russell | 2008-07-31 11:45:31 -0500 (Thu, 31 Jul 2008) | 7 lines

In case we have some processing threads that free more frames than they allocate,
do not let the frame cache grow forever.

(closes issue #13160)
Reported by: tavius
Tested by: tavius, russell

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134816 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 16:53:18 +00:00
Russell Bryant
61077f93d3 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134806 65c4cc65-6c06-0410-ace0-fbb531ad65f3 2008-07-31 16:38:28 +00:00
Mark Michelson
a97827b540 Merged revisions 134759 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134759 | mmichelson | 2008-07-31 11:05:12 -0500 (Thu, 31 Jul 2008) | 24 lines

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

........
r134758 | mmichelson | 2008-07-31 10:56:18 -0500 (Thu, 31 Jul 2008) | 16 lines

Add more timeout checks into app_queue, specifically
targeting areas where an unknown and potentially
long time has just elapsed. Also added a check
to try_calling() to return early if the timeout
has elapsed instead of potentially setting a negative
timeout for the call (thus making it have *no* timeout
at all).


(closes issue #13186)
Reported by: miquel_cabrespina
Patches:
      13186.diff uploaded by putnopvut (license 60)
Tested by: miquel_cabrespina


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134760 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 16:07:14 +00:00
Tilghman Lesher
032752eeb5 Blocked revisions 134705 via svnmerge
................
r134705 | tilghman | 2008-07-30 17:40:48 -0500 (Wed, 30 Jul 2008) | 9 lines

Blocked revisions 134704 via svnmerge

........
r134704 | tilghman | 2008-07-30 17:39:57 -0500 (Wed, 30 Jul 2008) | 2 lines

Oops, wrong define

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134707 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 22:41:54 +00:00
Tilghman Lesher
6d5f021393 Merged revisions 134703 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134703 | tilghman | 2008-07-30 17:38:58 -0500 (Wed, 30 Jul 2008) | 2 lines

Oops, wrong define

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 22:41:23 +00:00
Tilghman Lesher
1e369845e3 Merged revisions 134650 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134650 | tilghman | 2008-07-30 16:40:08 -0500 (Wed, 30 Jul 2008) | 12 lines

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

........
r134649 | tilghman | 2008-07-30 16:38:50 -0500 (Wed, 30 Jul 2008) | 4 lines

Qwell pointed out, via IRC, that the previous fix only worked when explicitly
set.  When nothing is set, and the option is implied, it breaks, because
configure sets the prefix to 'NONE'.  Fixing.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134651 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 21:41:23 +00:00
Mark Michelson
8feaba9ab0 Merged revisions 134598 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134598 | mmichelson | 2008-07-30 16:05:37 -0500 (Wed, 30 Jul 2008) | 15 lines

Merged revisions 134556 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r134556 | mmichelson | 2008-07-30 15:24:40 -0500 (Wed, 30 Jul 2008) | 7 lines

Fix the parsing of the "reason" parameter in the
Diversion: header.

(closes issue #13195)
Reported by: woodsfsg


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 21:06:12 +00:00
Russell Bryant
740073aaf8 Merged revisions 134596 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134596 | russell | 2008-07-30 15:38:35 -0500 (Wed, 30 Jul 2008) | 14 lines

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

........
r134595 | russell | 2008-07-30 15:37:17 -0500 (Wed, 30 Jul 2008) | 6 lines

Reduce stack consumption by 12.5% of the max stack size to fix a crash when
compiled with LOW_MEMORY.

(closes issue #13154)
Reported by: edantie

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134597 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 20:39:02 +00:00
Mark Michelson
d6b4e025b0 Merged revisions 134556 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134556 | mmichelson | 2008-07-30 15:24:40 -0500 (Wed, 30 Jul 2008) | 7 lines

Fix the parsing of the "reason" parameter in the
Diversion: header.

(closes issue #13195)
Reported by: woodsfsg


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 20:25:57 +00:00
Russell Bryant
d9041c8424 Merged revisions 134541 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134541 | russell | 2008-07-30 14:55:31 -0500 (Wed, 30 Jul 2008) | 12 lines

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

........
r134540 | russell | 2008-07-30 14:52:53 -0500 (Wed, 30 Jul 2008) | 4 lines

Fix a memory leak in func_curl.  Every thread that used this function leaked
an allocation the size of a pointer.
(reported by jmls in #asterisk-dev)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 19:56:24 +00:00
Tilghman Lesher
9179cfcfab Merged revisions 134538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134538 | tilghman | 2008-07-30 14:48:37 -0500 (Wed, 30 Jul 2008) | 12 lines

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

........
r134536 | tilghman | 2008-07-30 14:47:16 -0500 (Wed, 30 Jul 2008) | 4 lines

Only override sysconfdir and mandir when prefix=/usr
(closes issue #13093)
 Reported by: pabelanger

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 19:49:45 +00:00
Tilghman Lesher
232ab001d2 Merged revisions 134483 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134483 | tilghman | 2008-07-30 14:17:38 -0500 (Wed, 30 Jul 2008) | 4 lines

Let "roundrobin" also reference rrmemory, for the 1.6 release (as described in
UPGRADE-1.4.txt)
(Closes issue #13181)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134484 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 19:18:12 +00:00
Tilghman Lesher
3a9aae2f65 Merged revisions 134481 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134481 | tilghman | 2008-07-30 14:05:35 -0500 (Wed, 30 Jul 2008) | 13 lines

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

........
r134480 | tilghman | 2008-07-30 14:03:44 -0500 (Wed, 30 Jul 2008) | 5 lines

launch_netscript sometimes returns -1, which fails to set AGISTATUS.  Map
failure to -1, so that AGISTATUS is always set.
(closes issue #13199)
 Reported by: smw1218

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134482 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 19:06:17 +00:00
Mark Michelson
656005417b Merged revisions 134476 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134476 | mmichelson | 2008-07-30 13:33:12 -0500 (Wed, 30 Jul 2008) | 12 lines

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

........
r134475 | mmichelson | 2008-07-30 13:31:47 -0500 (Wed, 30 Jul 2008) | 4 lines

Fix a spot where a function could return without bringing
a channel out of autoservice.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 18:33:58 +00:00
Tilghman Lesher
6c0fd16554 Blocked revisions 134442-134443 via svnmerge
........
r134442 | tilghman | 2008-07-30 12:32:28 -0500 (Wed, 30 Jul 2008) | 7 lines

Add adaptive capabilities to the sqlite realtime driver
(closes issue #13097)
 Reported by: gknispel_proformatique
 Patches: 
       20080730__bug13097.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76

........
r134443 | tilghman | 2008-07-30 12:36:31 -0500 (Wed, 30 Jul 2008) | 2 lines

Document adaptive capabilities

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134444 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 17:37:12 +00:00
Tilghman Lesher
9ee4daf685 Blocked revisions 134401 via svnmerge
........
r134401 | tilghman | 2008-07-30 11:40:43 -0500 (Wed, 30 Jul 2008) | 7 lines

Move implementation of an attended-transfer-complete sound from one channel
driver into a common place for multiple channel drivers.
(closes issue #13152)
 Reported by: caio1982
 Patches: 
       atxfer_complete_sound3.diff uploaded by caio1982 (license 22)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134405 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 16:43:11 +00:00
Kevin P. Fleming
9386205b4b Merged revisions 134355 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134355 | kpfleming | 2008-07-30 10:32:14 -0500 (Wed, 30 Jul 2008) | 10 lines

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

........
r134352 | kpfleming | 2008-07-30 10:29:17 -0500 (Wed, 30 Jul 2008) | 2 lines

use the proper method for building version.h

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 15:34:08 +00:00
Tilghman Lesher
096b9d2b75 Blocked revisions 134353 via svnmerge
........
r134353 | tilghman | 2008-07-30 10:30:18 -0500 (Wed, 30 Jul 2008) | 8 lines

Add %u and %g to the ASTERISK_PROMPT settings, for username and group,
respectively.  Also, take the opportunity to clean up the CLI prompt
generation code.
(closes issue #13175)
 Reported by: eliel
 Patches: 
       cliprompt.patch uploaded by eliel (license 64)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134354 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 15:31:10 +00:00
Tilghman Lesher
200a0295e4 Blocked revisions 134312 via svnmerge
........
r134312 | tilghman | 2008-07-29 18:00:45 -0500 (Tue, 29 Jul 2008) | 6 lines

Minor changes to reduce packaging changes made by the Fedora maintainer.
(closes issue #12974)
 Reported by: jcollie
 Patches: 
       0001-Don-t-override-duplicate-optimization-flags.patch uploaded by jcollie (license 412)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-29 23:01:26 +00:00
Kevin P. Fleming
25fe3c40f1 Merged revisions 134260 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134260 | kpfleming | 2008-07-29 17:22:13 -0500 (Tue, 29 Jul 2008) | 2 lines

build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for features that will always be present in DAHDI

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-29 22:29:11 +00:00
Tilghman Lesher
2e8d6fc9b8 Merged revisions 134163 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134163 | tilghman | 2008-07-28 17:07:12 -0500 (Mon, 28 Jul 2008) | 15 lines

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

........
r134161 | tilghman | 2008-07-28 16:50:50 -0500 (Mon, 28 Jul 2008) | 7 lines

Detect when sox fails to raise the volume, because sox can't read the file.
(closes issue #12939)
 Reported by: rickbradley
 Patches: 
       20080728__bug12939.diff.txt uploaded by Corydon76 (license 14)
 Tested by: rickbradley

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134164 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 22:16:39 +00:00
Mark Michelson
b2eaaae0b5 Merged revisions 134125 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134125 | mmichelson | 2008-07-28 14:53:56 -0500 (Mon, 28 Jul 2008) | 27 lines

This commit compensates for buggy poll(2)
implementations. Asterisk has, for a long time,
had its own implementation of poll(2) which
just used the input arguments to call select(2).
In 1.4, this internal implementation was used
for Darwin systems. This was removed in Asterisk
trunk at some point, but it seems as though this
was not the right move to make.

On Mac OS X, it appears as though the poll used
to gather CLI input does not respond properly
when connecting via a remote Asterisk console.
Reverting to the use of Asterisk's poll fixed
the issue.

Also, there is now an option for the configure
script, --enable-internal-poll, which will allow
for anyone to use Asterisk's internal poll
implementation in case they suspect that their
system's poll implementation is buggy.

closes issue #11928)
Reported by: adriavidal
Patches:
      1.6.0-configurev2.patch uploaded by putnopvut (license 60)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 19:55:44 +00:00
Tilghman Lesher
bdbeb72fc4 Blocked revisions 134088 via svnmerge
........
r134088 | tilghman | 2008-07-28 11:49:29 -0500 (Mon, 28 Jul 2008) | 7 lines

Change SendImage() to output a more consistent status variable.
(closes issue #13134)
 Reported by: eliel
 Patches: 
       app_image.c.patch uploaded by eliel (license 64)
       UPGRADE.patch uploaded by eliel (license 64)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 16:50:42 +00:00
Kevin P. Fleming
261a4972f6 Merged revisions 134086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134086 | kpfleming | 2008-07-28 11:42:00 -0500 (Mon, 28 Jul 2008) | 3 lines

remove remaining Zaptel references in various places


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 16:49:18 +00:00
Mark Michelson
7eb4b5bf5b Merged revisions 134050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134050 | mmichelson | 2008-07-28 11:00:19 -0500 (Mon, 28 Jul 2008) | 3 lines

merging the zap_and_dahdi_trunk branch up to trunk


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 16:13:34 +00:00
Russell Bryant
322153ad93 Blocked revisions 134005 via svnmerge
........
r134005 | russell | 2008-07-27 16:12:14 -0500 (Sun, 27 Jul 2008) | 4 lines

Add a missing unlock within error handling
(closes issue #13176)
Reported by: pj

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134006 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-27 21:12:43 +00:00
Russell Bryant
86cef15735 Include the licensing page in 1.6.0 as well. Now, this page exists in 1.4, trunk,
and 1.6.0.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133982 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-26 15:34:42 +00:00
Russell Bryant
a12da2ad99 unblock 133575
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133981 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-26 15:34:02 +00:00
Russell Bryant
42cf9fc54e Merged revisions 133945-133946 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r133945 | russell | 2008-07-26 10:15:14 -0500 (Sat, 26 Jul 2008) | 6 lines

ast_device_state() gets called in two different ways.  The first way is when
called from elsewhere in Asterisk to find the current state of a device.  In
that case, we want to use the cached value if it exists.  The other way is when
processing a device state change.  In that case, we do not want to check the
cache because returning the last known state is counter productive.

........
r133946 | russell | 2008-07-26 10:16:20 -0500 (Sat, 26 Jul 2008) | 1 line

actually use the cache_cache argument
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-26 15:17:46 +00:00
Russell Bryant
c34ad0f0a3 Blocked revisions 133943 via svnmerge
........
r133943 | russell | 2008-07-26 09:57:50 -0500 (Sat, 26 Jul 2008) | 2 lines

Re-work comment about how device state changes are processed to be a bit more clear

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133944 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-26 14:59:05 +00:00
Russell Bryant
f5b0d8449b Blocked revisions 133941 via svnmerge
........
r133941 | russell | 2008-07-26 09:46:13 -0500 (Sat, 26 Jul 2008) | 3 lines

Remove the code that decided when device state changes should be cached or not.
It is no longer needed.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133942 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-26 14:46:39 +00:00
Tilghman Lesher
c4322a9321 Blocked revisions 133904 via svnmerge
........
r133904 | tilghman | 2008-07-25 17:08:06 -0500 (Fri, 25 Jul 2008) | 7 lines

Hebrew syntax for voicemail prompts
(closes issue #13155)
 Reported by: greenfieldtech
 Patches: 
       app_voicemail.c.patch uploaded by greenfieldtech (license 369)
       hebrew.ods uploaded by greenfieldtech (license 369)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 22:09:43 +00:00
Tilghman Lesher
3763dbdf2f Merged revisions 133902 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r133902 | tilghman | 2008-07-25 16:59:39 -0500 (Fri, 25 Jul 2008) | 6 lines

Update version
(closes issue #13163)
 Reported by: suretec
 Patches: 
       asterisk.ldif uploaded by suretec (license 70)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 22:00:17 +00:00
Tilghman Lesher
a8eb72453a Blocked revisions 133860 via svnmerge
........
r133860 | tilghman | 2008-07-25 16:20:03 -0500 (Fri, 25 Jul 2008) | 2 lines

Deprecate *_device_state_* APIs in favor of *_devstate_* APIs

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133863 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 21:20:55 +00:00
Brandon Kruse
2ed19e39b4 Blocking revert of code changes in r133770
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133806 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 19:37:03 +00:00
Brandon Kruse
1dc7b64454 Include the http_decode function from trunk
to replace the + with a space.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 19:34:17 +00:00
Tilghman Lesher
954533dab7 Blocked revisions 133710 via svnmerge
................
r133710 | tilghman | 2008-07-25 13:01:58 -0500 (Fri, 25 Jul 2008) | 10 lines

Blocked revisions 133709 via svnmerge

........
r133709 | tilghman | 2008-07-25 13:00:33 -0500 (Fri, 25 Jul 2008) | 3 lines

Remove unnecessary mmap flag
(Closes issue #13161)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133711 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 18:02:51 +00:00
Brandon Kruse
3f701cd720 Blocking a fix from trunk for the function
http_decode. 1.6.0 does not have this function.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133694 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 17:33:47 +00:00
Tilghman Lesher
e680b3734f Merged revisions 133665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r133665 | tilghman | 2008-07-25 12:24:43 -0500 (Fri, 25 Jul 2008) | 16 lines

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

........
r133649 | tilghman | 2008-07-25 12:19:39 -0500 (Fri, 25 Jul 2008) | 8 lines

Fix some errant device states by making the devicestate API more strict in
terms of the device argument (only without the unique identifier appended).
(closes issue #12771)
 Reported by: davidw
 Patches: 
       20080717__bug12771.diff.txt uploaded by Corydon76 (license 14)
 Tested by: davidw, jvandal, murf

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 17:26:38 +00:00
Russell Bryant
8209b6c64b Merged revisions 133579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r133579 | russell | 2008-07-25 10:00:49 -0500 (Fri, 25 Jul 2008) | 18 lines

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

................
r133578 | russell | 2008-07-25 10:00:31 -0500 (Fri, 25 Jul 2008) | 10 lines

Merged revisions 133577 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r133577 | russell | 2008-07-25 10:00:13 -0500 (Fri, 25 Jul 2008) | 2 lines

Fix the IAX2 URI for calling Digium

........

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 15:01:02 +00:00
Russell Bryant
123e9dfbd5 Blocked revisions 133575 via svnmerge
........
r133575 | russell | 2008-07-25 09:57:11 -0500 (Fri, 25 Jul 2008) | 8 lines

Modify the main page of the doxygen documentation to link to a new page dedicated
to Asterisk licensing information.  The licensing page includes the Asterisk license,
as well as a (not yet complete) list of 3rd party libraries that may be used, as well
as what license we receive them under.

Help filling out this list in the format that I have started in doxyref.h would be
much appreciated.  :)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133576 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 14:57:32 +00:00
Mark Michelson
19380639cb Merged revisions 133573 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r133573 | mmichelson | 2008-07-25 09:40:52 -0500 (Fri, 25 Jul 2008) | 15 lines

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

........
r133572 | mmichelson | 2008-07-25 09:40:10 -0500 (Fri, 25 Jul 2008) | 7 lines

We need to make sure to null-terminate the "name"
portion of SIP URI parameters so that there are no
bogus comparisons.

Thanks to bbryant for pointing this out.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133574 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 14:41:40 +00:00
Mark Michelson
78d821c4bd Blocked revisions 133570 via svnmerge
........
r133570 | mmichelson | 2008-07-25 08:52:52 -0500 (Fri, 25 Jul 2008) | 5 lines

Add a missing unlock.

Pointed out by Atis Lezdins in #asterisk-dev


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-25 13:54:19 +00:00