[svn-commits] russell: branch russell/LaTeX_docs r58929 - in /team/russell/LaTeX_docs: ./ c...

[svn-commits at lists.digium.com]

Author: russell
Date: Thu Mar 15 17:08:23 2007
New Revision: 58929

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58929
Log:
Merged revisions 58906,58923 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58906 | russell | 2007-03-14 14:18:08 -0500 (Wed, 14 Mar 2007) | 4 lines

Some people like to put "limitonpeer" instead of "limitonpeers" in their
configuration.  While we're at it, support "limitonpeerz" and 
"limitonpeerssssss".  (inspired by issue #9172)

........
r58923 | file | 2007-03-15 13:13:21 -0500 (Thu, 15 Mar 2007) | 2 lines

Don't assume that the pvt structure will still exist after calling schedule_delivery as it may not. (issue #9278 reported by fmachado)

........

Modified:
    team/russell/LaTeX_docs/   (props changed)
    team/russell/LaTeX_docs/channels/chan_iax2.c
    team/russell/LaTeX_docs/channels/chan_sip.c

Propchange: team/russell/LaTeX_docs/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 15 17:08:23 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-58902
+/branches/1.4:1-58928

Modified: team/russell/LaTeX_docs/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/LaTeX_docs/channels/chan_iax2.c?view=diff&rev=58929&r1=58928&r2=58929
==============================================================================
--- team/russell/LaTeX_docs/channels/chan_iax2.c (original)
+++ team/russell/LaTeX_docs/channels/chan_iax2.c Thu Mar 15 17:08:23 2007
@@ -6392,7 +6392,8 @@
 									if (duped_fr) {
 										schedule_delivery(duped_fr, updatehistory, 1, &fr->ts);
 									}
-									if (iaxs[fr->callno]->last < fr->ts) {
+									/* It is possible for the pvt structure to go away after we call schedule_delivery */
+									if (iaxs[fr->callno] && iaxs[fr->callno]->last < fr->ts) {
 										iaxs[fr->callno]->last = fr->ts;
 #if 1
 										if (option_debug && iaxdebug)

Modified: team/russell/LaTeX_docs/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/LaTeX_docs/channels/chan_sip.c?view=diff&rev=58929&r1=58928&r2=58929
==============================================================================
--- team/russell/LaTeX_docs/channels/chan_sip.c (original)
+++ team/russell/LaTeX_docs/channels/chan_sip.c Thu Mar 15 17:08:23 2007
@@ -16298,7 +16298,7 @@
 			compactheaders = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "notifymimetype")) {
 			ast_copy_string(default_notifymime, v->value, sizeof(default_notifymime));
-		} else if (!strcasecmp(v->name, "limitonpeers")) {
+		} else if (!strncasecmp(v->name, "limitonpeer", 11)) {
 			global_limitonpeers = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "directrtpsetup")) {
 			global_directrtpsetup = ast_true(v->value);