Commit graph

11673 commits

Author SHA1 Message Date
Olle Johansson
d326d84ae0 - Adding some missing spaces
- Correcting error messages
- Disabling code that doesn't do anything
- Making sure we always respond to this request, happily


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-05 08:05:38 +00:00
Pari Nannapaneni
f1ca07ea8b Merged revisions 63047 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63047 | pari | 2007-05-04 11:45:29 -0500 (Fri, 04 May 2007) | 1 line

explanation for httptimeout in manager.conf
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63105 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-04 20:11:03 +00:00
Jason Parker
cddb061140 Merged revisions 63099 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63099 | qwell | 2007-05-04 15:03:49 -0500 (Fri, 04 May 2007) | 4 lines

Fix a crash when checking version attribute in an incoming XML caps element.

Issue 9667, patch by phsultan.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-04 20:06:02 +00:00
Russell Bryant
6606166454 Convert spaces to tabs for indentation.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-04 19:48:52 +00:00
Steve Murphy
7ec9a2fb57 According to my testing, it's better if the ast_find_call_feature func ran this way instead, as far as the snom record button is concerned
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-04 18:47:19 +00:00
Steve Murphy
02337303ef a small upgrade to the coding standard, and an update to the code that triggered the upgrade.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63048 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-04 17:49:20 +00:00
Steve Murphy
3ee0077f04 Added a small bit of code to support the SNOM 360's Record button. Made the find_feature func in res_features.c public, so I could use it to find the automon dial sequence as configured by the user. When the INFO packet has a Record: header with on/off, the sequence is sent as consecutive DTMF frames on the phone's channel, triggering the automon functionality. The user has to configure the automon in features.conf, and set up his dialplan accordingly.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-04 16:37:23 +00:00
Olle Johansson
1b15d8852d Add the new ChannelUpdate event to inform manager clients about the PVT ID and some other channel driver data that
is needed to follow the call through the PBX.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-04 13:56:25 +00:00
Olle Johansson
6da70edbcf Add "CoreStatus" - from the moremanager branch.
This can be extended with more information, ideas and patches are welcome, as usual :-)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63031 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-04 13:47:11 +00:00
Olle Johansson
51f99c5265 - Add manager command CoreSettings
- Add missing option to options.h
- Add missing variables to asterisk.h
- Move manager version to manager.h include file


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-04 13:44:50 +00:00
Joshua Colp
81cade7a4c Merged revisions 62989 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r62989 | file | 2007-05-03 13:44:00 -0300 (Thu, 03 May 2007) | 10 lines

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

........
r62987 | file | 2007-05-03 13:42:19 -0300 (Thu, 03 May 2007) | 2 lines

When a peer is seeded or built tell the devicestate core to update it's status. This is easier then having chan_sip load before pbx_config. (issue #9658 reported by dlynes)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62990 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-03 16:45:39 +00:00
Kevin P. Fleming
431b4a44d0 Merged revisions 62986 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62986 | kpfleming | 2007-05-03 11:38:56 -0500 (Thu, 03 May 2007) | 2 lines

improve loader a bit, by avoiding trying to initialize embedded modules twice and avoiding trying to load modules from disk when they have been loaded already during the 'preload' pass (reported by blitzrage on IRC, patch by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-03 16:43:49 +00:00
Russell Bryant
1e3b1a576c Merged revisions 62942 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62942 | russell | 2007-05-03 10:23:13 -0500 (Thu, 03 May 2007) | 17 lines

Fix YADB (Yet Another DTMF Bug) ((C) Russell Bryant, 2007, TM, Patent Pending).

This set of changes came from a debugging session I had with Dwayne Hubbard.
When he called into his home FXO, ran the Echo application, and pressed a
digit, the digit would be echoed back and would never end.  This is fixed,
along with a couple other little improvements.

* When chan_zap is in the middle of playing a digit to a channel, it feeds
  back null frames, not voice frames.  So, I have modified ast_read to check
  the timing on emulated DTMF when it receives null frames, in addition to
  where it was doing this on voice frames.
* Make a tweak to setting the duration on emulated DTMF digits.  If there was
  no duration specified, it set it to be the minimum, instead of the default.
* Instead of timing the emulated digits off of the number of samples in audio
  frames that pass through, just use time values.  Now there is no code in this
  section that assumes 8kHz audio.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62943 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-03 15:23:44 +00:00
Steve Murphy
51bb06c0fe blocking 62913 (1.4) from trunk, as it's already done here
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62914 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-03 14:44:42 +00:00
Steve Murphy
dc8f6a9473 Merged revisions 62883 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62883 | murf | 2007-05-03 07:54:56 -0600 (Thu, 03 May 2007) | 1 line

These mods fix bug 9623, where an '@' in the eswitch contents causes a syntax error. I also updated the regressions.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62911 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-03 14:24:00 +00:00
Kevin P. Fleming
f44a236d08 Merged revisions 62842 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r62842 | kpfleming | 2007-05-02 20:23:37 -0400 (Wed, 02 May 2007) | 10 lines

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

........
r62841 | kpfleming | 2007-05-02 20:23:00 -0400 (Wed, 02 May 2007) | 2 lines

doh... initializing the pointer variable will work just a bit better

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62843 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-03 00:25:50 +00:00
Kevin P. Fleming
65cf5ba448 ignore the archive we build in this directory
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62826 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-03 00:11:17 +00:00
Kevin P. Fleming
a2c8e8a4a7 Merged revisions 62797,62807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r62797 | kpfleming | 2007-05-02 19:57:23 -0400 (Wed, 02 May 2007) | 7 lines

improve static Realtime config loading from PostgreSQL:
	don't request sorting on fields that are pointless to sort on
	use ast_build_string() instead of snprintf()
	don't request the list of fieldnames that resulted from the query when we both knew what they were before we ran the query _AND_ we aren't going to do anything with them anyway

(patch by me, inspired by blitzrage's bug report about res_config_odbc)

................
r62807 | kpfleming | 2007-05-02 20:02:57 -0400 (Wed, 02 May 2007) | 15 lines

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

........
r62796 | kpfleming | 2007-05-02 19:53:46 -0400 (Wed, 02 May 2007) | 7 lines

increase reliability and efficiency of static Realtime config loading via ODBC:
	don't request fields we aren't going to use
	don't request sorting on fields that are pointless to sort on
	explicitly request the fields we want, because we can't expect the database to always return them in the order they were created
	
(reported by blitzrage in person (!), patch by me)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62824 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-03 00:10:38 +00:00
Russell Bryant
cef98155ef Fix some bad grammar.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62795 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 23:50:29 +00:00
Russell Bryant
a6ec2bd182 When a conference is created, the UNIQUEID of the channel that caused it to be
created will now be stored. Then, every channel that joins the conference will
have the MEETMEUNIQUEID channel variable set with this ID.  This can be used to
relate callers that come and go from long standing conferences.
(issue #7295, patch by softins)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62794 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 23:50:07 +00:00
Russell Bryant
37602ccf52 Note Hungarian language support in CHANGES
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 23:31:22 +00:00
Russell Bryant
5d0f7ea753 Add Hungarian language support to say.c and say.conf.
(issue #7077, patch by adomjan)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 23:30:07 +00:00
Russell Bryant
255f151582 Merged revisions 62789 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62789 | russell | 2007-05-02 17:59:09 -0500 (Wed, 02 May 2007) | 20 lines

Merge changes from team/russell/inband_dtmf ...

Fix some issues related to generating inband DTMF.  There are two changes here:

1)   The list of DTMF tones in the senddigit_begin() function explicitly
   specified 100ms of the tone followed by 100ms of silence.  This really
   broke things with the way that Asterisk now wants complete control
   over when the digit begins and ends.  So, regardless of what Asterisk
   really wanted to do, this was going to play out the tone at the length it
   wanted to.  This caused various problems like DTMF translation to inband to
   be extremely unreliable.
     The list of tones has been changed so that the correct DTMF tone is played
   indefinitely until Asterisk tells it to stop.

2) ast_write() had to be modified to let a DTMF_END frame get processed even
   when a generator is present.  This is how the tone will finally get stopped.

(issues #8944, #9250, #9348, maybe others.  Thanks to mdu113 from #8944 for
 the testing and feedback!)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 23:00:07 +00:00
Steve Murphy
8e90622210 Merged revisions 62738 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r62738 | murf | 2007-05-02 14:46:07 -0600 (Wed, 02 May 2007) | 9 lines

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

........
r62737 | murf | 2007-05-02 14:10:32 -0600 (Wed, 02 May 2007) | 1 line

Some tweaks to satisfy CDR bug 8796, where being in 'h' extension louses up the dst field
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62741 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 20:57:55 +00:00
Russell Bryant
5fc0c60cfe Blocked revisions 62739 via svnmerge
........
r62739 | russell | 2007-05-02 15:55:00 -0500 (Wed, 02 May 2007) | 3 lines

Backport the change that only went in to trunk that fixes the command manager
action over http.  (reported internally by pari and bkruse)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62740 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 20:55:32 +00:00
Tilghman Lesher
121561076e Merged revisions 62692 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r62692 | tilghman | 2007-05-02 12:43:48 -0500 (Wed, 02 May 2007) | 12 lines

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

........
r62691 | tilghman | 2007-05-02 12:38:16 -0500 (Wed, 02 May 2007) | 4 lines

Issue 9638 - if a text frame is sent with no terminating NULL through a bridged
IAX connection, the remote end will receive garbage characters tacked onto the
end.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62693 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 17:49:36 +00:00
Steve Murphy
fe7068a51b Merged revisions 62689 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62689 | murf | 2007-05-02 11:10:50 -0600 (Wed, 02 May 2007) | 1 line

a)In chan_zap, set the clid, src fields in channel_alloc call. b)in the channel_alloc func, set the cid_num and name fields from the arglist[blush]. c) don't update the channel app & app data fields if you are in the 'h' extension. d)the load_module func in cdr_radius needs to return DECLINE, SUCCESS.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62690 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 17:24:03 +00:00
Russell Bryant
3d409eb793 Update the device state functionality of chan_local such that it will return
NOT_INUSE or INUSE when Local channels are in use as opposed to just UNKNOWN.
It will still return INVALID if the extension doesn't exist at all.
(issue #8048, patch from tim_ringenbach)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62673 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 15:46:49 +00:00
Russell Bryant
0dc5766279 Add the new options for attended transfer to the CHANGES file.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62672 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 15:20:41 +00:00
Russell Bryant
65ac2341c0 For some reason when I merged 802.1p support, the new documentation file was
not properly added.  Thanks to IgorG for pointing it out!  :)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 15:17:26 +00:00
Olle Johansson
e1ec3f917c Add a small message that we're doing something. On my systems, there's a long
dead period with a non-responsive CLI after I issue "load chan_sip.so"


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62656 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 12:12:02 +00:00
Olle Johansson
1d51b2e161 More username body parts to fix... If working, this needs to be backported to 1.2, 1.4.
But first, some serious SIP testing :-)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 12:00:03 +00:00
Olle Johansson
8fee67c83b Handle sip:username;parameter=12345@example.com;parameter=1234 URI's properly
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62640 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 09:41:03 +00:00
Olle Johansson
daefa6a8b4 Merged revisions 62624 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62624 | oej | 2007-05-02 08:15:43 +0200 (Wed, 02 May 2007) | 2 lines

Don't unlock a channel that we already know does not exist (propably isue 8228)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 09:35:14 +00:00
Olle Johansson
2a8a2f18b3 Updating CREDITS
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62609 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 05:57:53 +00:00
Russell Bryant
7df63e233c In addition to making it so attended transfers don't fail unnecessarily,
add some new options to control what happens when you hangup on an attended
transfer before the target extension answers the transferred channel.  You
can now have it send the transferee back to the transferer.
(issue #8413, patch from sergee with very minor modifications by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-01 22:24:51 +00:00
Russell Bryant
37d94ceab9 Merged revisions 62548 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r62548 | russell | 2007-05-01 16:57:10 -0500 (Tue, 01 May 2007) | 12 lines

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

........
r62547 | russell | 2007-05-01 16:55:19 -0500 (Tue, 01 May 2007) | 4 lines

Remove an unnecessary check that makes it so if you hang up after doing an
attended transfer before the target extension answers the channel, the transfer
is not successful.  (issue #9338, patch by svanlund)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62549 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-01 21:57:58 +00:00
Tilghman Lesher
2059f767dd Merged revisions 62545 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62545 | tilghman | 2007-05-01 16:34:43 -0500 (Tue, 01 May 2007) | 2 lines

Bug 9590 - Memory leaks around find_user() (found by rayjay, different fixes by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62546 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-01 21:41:48 +00:00
Russell Bryant
32ca8db474 Merged revisions 62497 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r62497 | russell | 2007-05-01 11:26:48 -0500 (Tue, 01 May 2007) | 11 lines

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

........
r62496 | russell | 2007-05-01 11:26:23 -0500 (Tue, 01 May 2007) | 3 lines

Add indications.conf information for the Philippines.
(issue #9525, reported and patched by loloski)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-01 16:27:14 +00:00
Russell Bryant
c82fd9020f Add a note to CHANGES about the new support for 802.1p. Thanks IgorG!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62480 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-30 21:54:13 +00:00
Russell Bryant
683417407e This patch adds additional information to the EXITWITHKEY and EXITWITHTIMEOUT
entries in the queue log.
(issue #7561, reported and originally patched by fkasumovic, patch slightly
 modified and updated to trunk by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62462 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-30 16:46:49 +00:00
Russell Bryant
b419fc1134 Add support for setting the CoS for VLAN traffic (802.1p) in Linux. The
file doc/qos.tex has been updated to document the new functionality.
(issue #9540, patch submitted by IgorG)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-30 16:16:26 +00:00
Russell Bryant
a91f9b138d Merged revisions 62419 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r62419 | russell | 2007-04-30 10:58:28 -0500 (Mon, 30 Apr 2007) | 12 lines

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

........
r62417 | russell | 2007-04-30 10:57:26 -0500 (Mon, 30 Apr 2007) | 4 lines

This patch fixes an issue where depending on the cause code, when the network
sends a PRI disconnect, the call may not be properly hung up.
(issue #9588, reported and patched by softins)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62422 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-30 15:59:27 +00:00
Russell Bryant
5cb08adc7a Don't crash when invalid arguments are provided to the CHANNEL() function
for a SIP channel.
(issue #9619, reported by jtodd, original patch by Corydon76, committed patch
 slightly modified by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62416 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-30 15:37:23 +00:00
Russell Bryant
3181a91148 Merged revisions 62414 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62414 | russell | 2007-04-30 10:25:31 -0500 (Mon, 30 Apr 2007) | 4 lines

When serving dynamic content, include a Cache-Control header to instruct the
browsers to not store the resulting content.  
(issue #9621, reported by Pari, patch by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62415 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-30 15:30:02 +00:00
Jason Parker
b942fe3d89 Merged revisions 62371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62371 | qwell | 2007-04-30 09:52:31 -0500 (Mon, 30 Apr 2007) | 2 lines

Remove unused (and potentially confusing) jitterbuffer options from sample config.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-30 14:56:43 +00:00
Joshua Colp
fe158ded8a Merged revisions 62369 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r62369 | file | 2007-04-30 11:36:11 -0300 (Mon, 30 Apr 2007) | 10 lines

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

........
r62368 | file | 2007-04-30 11:34:07 -0300 (Mon, 30 Apr 2007) | 2 lines

Update copyright notice. It's now the year 2007!

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-30 14:37:47 +00:00
Russell Bryant
0efe511879 Merged revisions 62331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62331 | russell | 2007-04-29 00:50:37 -0500 (Sun, 29 Apr 2007) | 3 lines

Fix a bug that made the "language" setting in zapata.conf not
functional.  (issue #9626, reported and fixed by sergee)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-29 05:51:18 +00:00
Russell Bryant
28244e7462 Blocked revisions 62299 via svnmerge
........
r62299 | russell | 2007-04-28 16:56:20 -0500 (Sat, 28 Apr 2007) | 2 lines

Note that the "talker optimization" option will be enabled by default in 1.6

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62300 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-28 21:56:46 +00:00
Russell Bryant
a4a2e973ec note MeetMe change in CHANGES
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-28 21:55:00 +00:00