Sean Bright
b41cc8891a
Merged revisions 138479 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r138479 | seanbright | 2008-08-17 09:51:08 -0400 (Sun, 17 Aug 2008) | 7 lines
Add Uniqueid header to ParkedCall manager event.
(closes issue #13323 )
Reported by: srt
Patches:
13323_unique_id_for_parkedcalls_event.diff uploaded by srt (license 378)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138481 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 14:07:42 +00:00
Sean Bright
9367e7b916
Merged revisions 138476 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r138476 | seanbright | 2008-08-17 09:40:36 -0400 (Sun, 17 Aug 2008) | 7 lines
Add missing colons to RTCPReceived and RTCPSent manager events.
(closes issue #13319 )
Reported by: srt
Patches:
13319_rtcp_manager_event_headers.diff uploaded by srt (license 378)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 13:42:59 +00:00
Sean Bright
9fb19a971f
Merged revisions 138473 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r138473 | seanbright | 2008-08-17 09:31:54 -0400 (Sun, 17 Aug 2008) | 7 lines
Fix the output of the JitterBufStats manager event.
(closes issue #13324 )
Reported by: srt
Patches:
13324_missing_nl_in_jitterbufstats_event_2.diff uploaded by srt (license 378)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 13:34:16 +00:00
Sean Bright
19580da4e0
Merged revisions 138442 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r138442 | seanbright | 2008-08-16 12:40:43 -0400 (Sat, 16 Aug 2008) | 4 lines
Since it's introduction in revision 3497, cdr_tds has *never* read
the port configuration option from cdr_tds.conf. So go ahead and
remove it from the sample config.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138444 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 16:42:43 +00:00
Tilghman Lesher
2b11ad30d6
Merged revisions 138412 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r138412 | tilghman | 2008-08-16 08:07:08 -0500 (Sat, 16 Aug 2008) | 2 lines
Fix compilation warnings (found with dev-mode)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138414 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 13:08:23 +00:00
Tilghman Lesher
88d23d712e
Merged revisions 138409 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r138409 | tilghman | 2008-08-16 07:52:06 -0500 (Sat, 16 Aug 2008) | 3 lines
Also make sure hinting won't crash on reload.
(Closes issue #13312 )
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138411 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 13:00:57 +00:00
Jeff Peeler
6484b49dc4
Merged revisions 138361 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
................
r138361 | jpeeler | 2008-08-15 20:13:26 -0500 (Fri, 15 Aug 2008) | 9 lines
Merged revisions 138360 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r138360 | jpeeler | 2008-08-15 20:12:18 -0500 (Fri, 15 Aug 2008) | 1 line
fixes use count to properly decrement if an active dahdi channel is destroyed allowing module to be unloaded
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138363 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 01:14:34 +00:00
Jeff Peeler
54092611a8
Merged revisions 138311 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
................
r138311 | jpeeler | 2008-08-15 18:46:09 -0500 (Fri, 15 Aug 2008) | 20 lines
Merged revisions 138119,138151,138238 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r138119 | jpeeler | 2008-08-15 14:21:51 -0500 (Fri, 15 Aug 2008) | 4 lines
Fixes the dahdi restart functionality. Dahdi restart allows one to restart all DAHDI channels, even if they are currently in use. This is different from unloading and then loading the module since unloading requires the use count to be zero. Reloading the module is different in that the signalling is not changed from what it was originally configured. Also, this fixes not closing all the file descriptors for D-channels upon module unload (which would prevent loading the module afterwards).
(closes issue #11017 )
........
r138151 | jpeeler | 2008-08-15 14:41:29 -0500 (Fri, 15 Aug 2008) | 1 line
declared static mutexes using AST_MUTEX_DEFINE_STATIC macro
........
r138238 | jpeeler | 2008-08-15 16:28:26 -0500 (Fri, 15 Aug 2008) | 1 line
initialize condition variable ss_thread_complete using ast_cond_init
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 00:38:21 +00:00
Tilghman Lesher
fcafa8cb49
Merged revisions 138260 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
................
r138260 | tilghman | 2008-08-15 17:54:57 -0500 (Fri, 15 Aug 2008) | 16 lines
Merged revisions 138258 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r138258 | tilghman | 2008-08-15 17:33:42 -0500 (Fri, 15 Aug 2008) | 8 lines
More fixes for realtime peers.
(closes issue #12921 )
Reported by: Nuitari
Patches:
20080804__bug12921.diff.txt uploaded by Corydon76 (license 14)
20080815__bug12921.diff.txt uploaded by Corydon76 (license 14)
Tested by: Corydon76
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138261 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 22:56:18 +00:00
Tilghman Lesher
aad266af22
Merged revisions 138207 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 20:37:20 +00:00
Jeff Peeler
4b83217511
Merged revisions 138155 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r138155 | jpeeler | 2008-08-15 15:12:19 -0500 (Fri, 15 Aug 2008) | 1 line
rename all zfd instances in chan_dahdi to dfd to match 1.4 (left over from DAHDI transition)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138184 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 20:28:20 +00:00
Russell Bryant
cd60aadb5e
Merged revisions 138028 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
................
r138028 | russell | 2008-08-15 10:09:46 -0500 (Fri, 15 Aug 2008) | 17 lines
Merged revisions 138027 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r138027 | russell | 2008-08-15 10:07:16 -0500 (Fri, 15 Aug 2008) | 9 lines
Ensure that when a hangup occurs in autoservice, that a hangup frame gets
properly deferred to be read from the channel owner when it gets taken out
of autoservice.
(closes issue #12874 )
Reported by: dimas
Patches:
v1-12874.patch uploaded by dimas (license 88)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 20:21:38 +00:00
Tilghman Lesher
f42b756512
Merged revisions 138148 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r138148 | tilghman | 2008-08-15 14:36:11 -0500 (Fri, 15 Aug 2008) | 2 lines
Change free to ast_free_ptr, too
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138150 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 19:37:22 +00:00
Tilghman Lesher
0ffc03dffc
Merged revisions 138124 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r138124 | tilghman | 2008-08-15 14:22:48 -0500 (Fri, 15 Aug 2008) | 4 lines
e->data can be NULL, so use the safe version of ast_strdup()
(closes issue #13312 )
Reported by: pj
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 19:24:27 +00:00
Tilghman Lesher
1cac97b8f8
Merged revisions 138086 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r138086 | tilghman | 2008-08-15 13:02:15 -0500 (Fri, 15 Aug 2008) | 2 lines
regseconds is actually stored as the epoch time, not registration length
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138088 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 18:03:44 +00:00
Tilghman Lesher
e0b60bc92c
Merged revisions 138024 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
................
r138024 | tilghman | 2008-08-15 10:03:32 -0500 (Fri, 15 Aug 2008) | 16 lines
Merged revisions 138023 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r138023 | tilghman | 2008-08-15 09:51:12 -0500 (Fri, 15 Aug 2008) | 8 lines
Additional check for more string specifiers than arguments.
(closes issue #13299 )
Reported by: adomjan
Patches:
20080813__bug13299.diff.txt uploaded by Corydon76 (license 14)
func_strings.c-sprintf.patch uploaded by adomjan (license 487)
Tested by: adomjan
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138026 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 15:04:53 +00:00
Russell Bryant
f7db6b56dd
Merged revisions 137987 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r137987 | russell | 2008-08-14 17:43:15 -0500 (Thu, 14 Aug 2008) | 2 lines
Fix a bashism that causes an error when trying to build the pdf on ubuntu
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 22:43:50 +00:00
Sean Bright
6bb2c37336
Merged revisions 137933 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r137933 | seanbright | 2008-08-14 14:47:28 -0400 (Thu, 14 Aug 2008) | 8 lines
Fix memory leak in cdr_sqlite3_custom.
(closes issue #13304 )
Reported by: eliel
Patches:
sqlite.patch uploaded by eliel (license 64)
(Slightly modified by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137935 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 18:50:09 +00:00
Tilghman Lesher
fb6959baae
Merged revisions 137848 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
................
r137848 | tilghman | 2008-08-14 11:52:43 -0500 (Thu, 14 Aug 2008) | 17 lines
Merged revisions 137847 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r137847 | tilghman | 2008-08-14 11:47:30 -0500 (Thu, 14 Aug 2008) | 9 lines
When creating the secondary subchannel name, it is necessary to compare to
the existing channel name without the "Zap/" or "DAHDI/" prefix, since our
test string is also without that prefix.
(closes issue #13027 )
Reported by: dferrer
Patches:
chan_zap-1.4.21.1_fix2.patch uploaded by dferrer (license 525)
(Slightly modified by me, to compensate for both names)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 18:15:35 +00:00
Russell Bryant
ab0653ed1c
Blocked revisions 137901 via svnmerge
...
........
r137901 | russell | 2008-08-14 13:12:16 -0500 (Thu, 14 Aug 2008) | 1 line
Prepare for adding 1.6.2 changes
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 18:12:46 +00:00
Jason Parker
b757f3247c
Merged revisions 137812 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r137812 | qwell | 2008-08-14 10:32:16 -0500 (Thu, 14 Aug 2008) | 8 lines
Make sure we set the socket port, so we don't try to use <ip address>:0.
(closes issue #13255 )
Reported by: falves11
Patches:
13255-socketport.diff uploaded by qwell (license 4)
Tested by: falves11
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137815 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 15:39:24 +00:00
Russell Bryant
baa115665e
Merged revisions 137732 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
................
r137732 | russell | 2008-08-14 09:15:50 -0500 (Thu, 14 Aug 2008) | 12 lines
Merged revisions 137731 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r137731 | russell | 2008-08-14 09:05:23 -0500 (Thu, 14 Aug 2008) | 4 lines
Comments in this config file were aligned only if your tab size was set to 8.
So, convert tabs to spaces so that things should be aligned regardless of what
tab size you use in your editor.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 15:35:32 +00:00
Sean Bright
87f0047a3a
Merged revisions 137780 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
........
r137780 | seanbright | 2008-08-14 11:03:03 -0400 (Thu, 14 Aug 2008) | 8 lines
If we detect that we are no longer connected, try to reconnect a few times
before giving up. This relies on the timeout settings in the freetds.conf
file and, unfortunately, on a recent version of FreeTDS (0.82 or newer).
I either need to change the current execs to be non-blocking (which I do
not want to do) or we have to force people to run with the latest and
greatest of FreeTDS. I'm on the fence...
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 15:06:49 +00:00
Kevin P. Fleming
d3adb4a6e5
Merged revisions 137680 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/trunk
................
r137680 | kpfleming | 2008-08-13 21:03:47 -0500 (Wed, 13 Aug 2008) | 9 lines
Merged revisions 137679 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r137679 | kpfleming | 2008-08-13 21:03:04 -0500 (Wed, 13 Aug 2008) | 1 line
forgot one module name that changed
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137683 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 02:08:56 +00:00
Kevin P. Fleming
8e58424220
configure for merging from trunk
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 02:08:36 +00:00
Kevin P. Fleming
98a8f57348
now that 1.6.0 has reached the 'release candidate' stage, it's time to branch 1.6.1
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137648 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 23:08:50 +00:00
Kevin P. Fleming
62efd337c1
make this script actually work
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137640 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 23:00:37 +00:00
Kevin P. Fleming
47ea5a01b4
Merged revisions 137530 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r137530 | kpfleming | 2008-08-13 15:46:19 -0500 (Wed, 13 Aug 2008) | 1 line
add document describing what users will need to be aware of when upgrading to this version and using DAHDI
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137627 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 22:33:32 +00:00
Jeff Peeler
81c3d0cfe4
Blocked revisions 137580 via svnmerge
...
........
r137580 | jpeeler | 2008-08-13 16:35:37 -0500 (Wed, 13 Aug 2008) | 3 lines
Register DAHDISendKeypadFacility application if dahdi_chan_mode is set to DAHDI + Zap. Mark ZapSendKeypadFacility application as deprecated on usage.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 21:49:11 +00:00
Jason Parker
84e049c075
Correctly end locally ended calls.
...
(closes issue #12170 )
Reported by: pj
Patches:
20080702__issue12170_clear_pendinginvite.diff uploaded by bbryant (license 36)
Tested by: bbryant, pabelanger
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137532 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 21:08:58 +00:00
Kevin P. Fleming
81a93277f9
Blocked revisions 137527,137529 via svnmerge
...
........
r137527 | kpfleming | 2008-08-13 15:33:47 -0500 (Wed, 13 Aug 2008) | 5 lines
document dahdichanname option in doc/asterisk-conf.txt
make chan_dahdi read its configuration from zapata.conf if dahdichanname has been set to 'no'
........
r137529 | kpfleming | 2008-08-13 15:42:33 -0500 (Wed, 13 Aug 2008) | 2 lines
remove some more chan_zap references
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137531 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 20:47:42 +00:00
Jason Parker
ccfbd9ab15
Add FAXMODE variable with what fax transport was used.
...
(closes issue #13252 )
Patches:
v1-13252.patch uploaded by dimas (license 88)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137496 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 20:05:50 +00:00
Tilghman Lesher
fdd92290af
Convert deprecated routines to the new names.
...
(closes issue #13297 )
Reported by: snuffy
Patches:
bug13297_20080814.diff uploaded by snuffy (license 35)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137456 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 17:36:15 +00:00
Sean Bright
16ff15a47a
Merged revisions 137405 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r137405 | seanbright | 2008-08-13 10:33:49 -0400 (Wed, 13 Aug 2008) | 1 line
Update docs to reflect the change to cdr_tds
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137406 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 14:41:49 +00:00
Sean Bright
c2faa7bfda
Use the ast_vasprintf macro instead of vasprintf directly.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137403 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 14:22:47 +00:00
Sean Bright
0c774b2896
Blocked revisions 137348 via svnmerge
...
........
r137348 | seanbright | 2008-08-12 20:10:35 -0400 (Tue, 12 Aug 2008) | 8 lines
Bring cdr_tds in line with the other CDR backends and have it try to store
CDR(userfield) if it is set. The new behavior is to check for the userfield
column on module load, and if it exists, we will store CDR(userfield) when
CDRs are written. A similar patch already went into trunk and 1.6.0.
(closes issue #13290 )
Reported by: falves11
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137349 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 00:11:13 +00:00
Russell Bryant
8fb13c6803
Grammar hax from Qwell
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137301 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-12 19:48:38 +00:00
Russell Bryant
f6bda9def2
Note that developer documentation belongs in doxygen, and not integrated with
...
the user manual stuff in doc/tex/.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-12 19:40:35 +00:00
Russell Bryant
239611711f
Make PRINT_DIR work as advertised.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137239 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-11 16:14:29 +00:00
Sean Bright
9c7099faae
Log the userfield CDR variable like the other CDR backends, assuming the
...
column is actually there. If it's not, we still log everything else as
before.
(closes issue #13281 )
Reported by: falves11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137203 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-11 14:25:15 +00:00
Tilghman Lesher
37133a6993
Merged revisions 137138 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r137138 | tilghman | 2008-08-10 19:20:38 -0500 (Sun, 10 Aug 2008) | 5 lines
Deallocate database connection handle on disconnect, as we allocate another
one on connect.
(closes issue #13271 )
Reported by: dveiga
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137150 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-11 00:25:28 +00:00
Sean Bright
7a636521b1
Fix this again so we can compile with shadow warnings enabled and IMAP chosen
...
in voicemail.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137112 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-10 21:10:04 +00:00
Sean Bright
74bf61579f
That's all, folks. Not going to update the Makefile until res_jabber is
...
converted (snuffy, you there? :))
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137110 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-10 20:57:25 +00:00
Sean Bright
790fde68d9
Another batch of files from RSW. The remaining apps and a few more
...
files from main/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-10 20:23:50 +00:00
Sean Bright
b69c8e6ab5
Another big chunk of changes from the RSW branch. Bunch of stuff from main/
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-10 19:35:50 +00:00
Sean Bright
3ffb39833b
More RSW merges. Everything from apps/ except for the big offenders
...
app_voicemail and app_queue.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-10 14:45:25 +00:00
Sean Bright
357bf3e90b
All of the res/ stuff (other than res_jabber) from the RSW branch.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137028 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-10 00:47:56 +00:00
Tilghman Lesher
b7571f835d
Merged revisions 136946 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r136946 | tilghman | 2008-08-09 10:25:36 -0500 (Sat, 09 Aug 2008) | 10 lines
Merged revisions 136945 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r136945 | tilghman | 2008-08-09 10:24:36 -0500 (Sat, 09 Aug 2008) | 2 lines
Regression fixes for Solaris
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-09 15:26:27 +00:00
Sean Bright
db1ed285c4
More RSW merges. This should do it for the channels/ dir.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136917 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-09 14:12:34 +00:00
Sean Bright
5275342c5e
Biggest offender? chan_dahdi.c! More RSW merging.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136890 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-09 13:13:48 +00:00