Matthew Nicholson a9c6ac6c57 Merged revisions 211876 via svnmerge from ...

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

........
  r211876 | mnicholson | 2009-08-12 14:53:14 -0500 (Wed, 12 Aug 2009) | 11 lines
  
  Make asterisk handle 423 Interval Too Short messages better.
  
  This change uses separate values for the acceptable minimum expiry provided by the 423 error and the expiry value stored in the configuration file.  Previously, the value pulled from the configuration file would be overwritten.
  
  (closes issue #14366)
  Reported by: Nick_Lewis
  Patches:
        sip-expiry-fix1.diff uploaded by mnicholson (license 96)
        chan_sip.c-reqexpiry.patch uploaded by Nick (license 657)
  Tested by: mnicholson
........


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

2009-08-12 22:39:55 +00:00

..

h323

Merged revisions 201678 via svnmerge from

2009-06-18 16:58:03 +00:00

misdn

Merged revisions 209760-209761 via svnmerge from

2009-08-01 01:13:03 +00:00

xpmr

Allow chan_usbradio to compile again.

2007-10-17 16:09:01 +00:00

chan_agent.c

AST-2009-005

2009-08-10 19:25:03 +00:00

chan_alsa.c

Merged revisions 196988 via svnmerge from

2009-05-27 13:04:10 +00:00

chan_console.c

Merged revisions 209554 via svnmerge from

2009-07-30 16:16:31 +00:00

chan_dahdi.c

AST-2009-005

2009-08-10 19:25:03 +00:00

chan_features.c

Merged revisions 160208 via svnmerge from

2008-12-02 00:57:31 +00:00

chan_gtalk.c

Merged revisions 185363 via svnmerge from

2009-03-31 17:36:07 +00:00

chan_h323.c

Merged revisions 191219 via svnmerge from

2009-04-29 23:14:51 +00:00

chan_iax2.c

AST-2009-005

2009-08-10 19:25:03 +00:00

chan_jingle.c

Merged revisions 130129 via svnmerge from

2008-07-11 18:14:27 +00:00

chan_local.c

Merged revisions 190287 via svnmerge from

2009-04-23 19:16:32 +00:00

chan_mgcp.c

AST-2009-005

2009-08-10 19:25:03 +00:00

chan_misdn.c

AST-2009-005

2009-08-10 19:25:03 +00:00

chan_nbs.c

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

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

chan_oss.c

AST-2009-005

2009-08-10 19:25:03 +00:00

chan_phone.c

AST-2009-005

2009-08-10 19:25:03 +00:00

chan_sip.c

Merged revisions 211876 via svnmerge from

2009-08-12 22:39:55 +00:00

chan_skinny.c

AST-2009-005

2009-08-10 19:25:03 +00:00

chan_unistim.c

Merged revisions 192938 via svnmerge from

2009-05-07 17:14:26 +00:00

chan_usbradio.c

AST-2009-005

2009-08-10 19:25:03 +00:00

chan_vpb.cc

Merged revisions 209098 via svnmerge from

2009-07-27 20:23:33 +00:00

console_board.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00

console_gui.c

Merged revisions 147807 via svnmerge from

2008-10-09 14:56:51 +00:00

console_video.c

Merged revisions 147807 via svnmerge from

2008-10-09 14:56:51 +00:00

console_video.h

Two changes:

2008-01-09 18:03:40 +00:00

DialTone.h

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

iax2-parser.c

Merged revisions 194833 via svnmerge from

2009-05-15 21:08:26 +00:00

iax2-parser.h

Merged revisions 194833 via svnmerge from

2009-05-15 21:08:26 +00:00

iax2-provision.c

AST-2009-005

2009-08-10 19:25:03 +00:00

iax2-provision.h

Don't reload a configuration file if nothing has changed.

2007-08-16 21:09:46 +00:00

iax2.h

Merged revisions 194833 via svnmerge from

2009-05-15 21:08:26 +00:00

Makefile

Merged revisions 207680 via svnmerge from

2009-07-21 13:39:44 +00:00

misdn_config.c

AST-2009-005

2009-08-10 19:25:03 +00:00

vcodecs.c

Merged revisions 147807 via svnmerge from

2008-10-09 14:56:51 +00:00

vgrabbers.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00