Steve Murphy 5acbac37b5 Merged revisions 160760 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

................
r160760 | murf | 2008-12-03 14:09:15 -0700 (Wed, 03 Dec 2008) | 23 lines

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

........
r160703 | murf | 2008-12-03 13:41:42 -0700 (Wed, 03 Dec 2008) | 11 lines

(closes issue #13597)
Reported by: john8675309
Patches:
      patch.13597 uploaded by murf (license 17)
Tested by: murf, john8675309

This patch causes the setcid func to update the CDR
clid after setting the channel field.

I also notice that in trunk, the num/number of 1.4 is
left out; I decided to include the option to use
either in trunk, so as not to have 1.4 upgraders
not to have problems.


........

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


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

2008-12-03 21:23:23 +00:00

..

func_base64.c

remove some unnecessary includes.

2007-11-19 20:42:06 +00:00

func_blacklist.c

remove some useless includes

2007-11-22 02:30:58 +00:00

func_callerid.c

Merged revisions 160760 via svnmerge from

2008-12-03 21:23:23 +00:00

func_cdr.c

Merged revisions 122091 via svnmerge from

2008-06-12 14:38:46 +00:00

func_channel.c

Context tracing for channels

2008-02-18 04:43:33 +00:00

func_curl.c

Merged revisions 134541 via svnmerge from

2008-07-30 19:56:24 +00:00

func_cut.c

Merged revisions 144569 via svnmerge from

2008-09-25 22:23:21 +00:00

func_db.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

func_devstate.c

Add a "devstate change" CLI command to control custom device states. Also,

2008-03-01 00:53:25 +00:00

func_dialgroup.c

Merged revisions 136112 via svnmerge from

2008-08-06 17:02:06 +00:00

func_dialplan.c

This function checks more than just contexts...

2007-12-27 09:13:07 +00:00

func_enum.c

Merged revisions 109447 via svnmerge from

2008-03-18 15:58:50 +00:00

func_env.c

Merged revisions 95470 via svnmerge from

2007-12-31 20:33:21 +00:00

func_extstate.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

func_global.c

Merged revisions 105899 via svnmerge from

2008-03-06 00:15:54 +00:00

func_groupcount.c

Merged revisions 97697 via svnmerge from

2008-01-10 15:12:08 +00:00

func_iconv.c

implement "configure" checks for libiconv, and add the

2008-01-01 22:08:32 +00:00

func_lock.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

func_logic.c

another bunch of include removals (errno.h and asterisk/logger.h)

2007-11-19 19:09:03 +00:00

func_math.c

another bunch of include removals (errno.h and asterisk/logger.h)

2007-11-19 19:09:03 +00:00

func_md5.c

remove some useless includes

2007-11-22 02:30:58 +00:00

func_module.c

remove some useless includes

2007-11-22 02:30:58 +00:00

func_odbc.c

port gcc 4.3.x warning fixes from trunk to this branch

2008-11-03 00:39:04 +00:00

func_rand.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

func_realtime.c

Add REALTIME_STORE and REALTIME_DESTROY dialplan functions provided by sergee.

2008-02-06 16:23:22 +00:00

func_sha1.c

remove some useless includes

2007-11-22 02:30:58 +00:00

func_shell.c

another bunch of include removals (errno.h and asterisk/logger.h)

2007-11-19 19:09:03 +00:00

func_strings.c

Merged revisions 152060 via svnmerge from

2008-10-26 20:26:18 +00:00

func_sysinfo.c

Merged revisions 131484 via svnmerge from

2008-07-16 21:54:38 +00:00

func_timeout.c

I needed to increment the numbers used on the VERBOSITY_ATLEAST calls by 1.

2007-12-14 19:19:07 +00:00

func_uri.c

another bunch of include removals (errno.h and asterisk/logger.h)

2007-11-19 19:09:03 +00:00

func_version.c

Simplify a trivial snprintf() with ast_copy_string()

2008-03-04 04:57:29 +00:00

func_vmcount.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

func_volume.c

remove some unnecessary includes.

2007-11-19 20:42:06 +00:00

Makefile

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00