[svn-commits] lmadsen: tag 1.8.7.2 r347548 - in /tags/1.8.7.2: cel/ channels/ configs/ cont...

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Thu Dec  8 11:20:45 2011
New Revision: 347548

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=347548
Log:
Merge revision #347531

Modified:
    tags/1.8.7.2/cel/cel_odbc.c   (props changed)
    tags/1.8.7.2/channels/chan_sip.c
    tags/1.8.7.2/configs/cel_odbc.conf.sample   (props changed)
    tags/1.8.7.2/contrib/realtime/mysql/iaxfriends.sql   (props changed)
    tags/1.8.7.2/contrib/realtime/mysql/meetme.sql   (props changed)
    tags/1.8.7.2/contrib/realtime/mysql/sipfriends.sql   (props changed)
    tags/1.8.7.2/contrib/realtime/mysql/voicemail.sql   (props changed)
    tags/1.8.7.2/contrib/realtime/postgresql/realtime.sql   (props changed)
    tags/1.8.7.2/sounds/Makefile   (props changed)

Propchange: tags/1.8.7.2/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  8 11:20:45 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
-/branches/1.8/cel/cel_odbc.c:345828-345829
+/branches/1.8/cel/cel_odbc.c:345828-345829,347530-347531

Modified: tags/1.8.7.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.7.2/channels/chan_sip.c?view=diff&rev=347548&r1=347547&r2=347548
==============================================================================
--- tags/1.8.7.2/channels/chan_sip.c (original)
+++ tags/1.8.7.2/channels/chan_sip.c Thu Dec  8 11:20:45 2011
@@ -18286,11 +18286,18 @@
 			per device. I don't want incoming callers to record calls in my
 			pbx.
 		*/
-		/* first, get the feature string, if it exists */
+		
 		struct ast_call_feature *feat;
 		int j;
 		struct ast_frame f = { AST_FRAME_DTMF, };
 
+		if (!p->owner) {        /* not a PBX call */
+			transmit_response(p, "481 Call leg/transaction does not exist", req);
+			sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
+			return;
+		}
+
+		/* first, get the feature string, if it exists */
 		ast_rdlock_call_features();
 		feat = ast_find_call_feature("automon");
 		if (!feat || ast_strlen_zero(feat->exten)) {

Propchange: tags/1.8.7.2/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  8 11:20:45 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
-/branches/1.8/configs/cel_odbc.conf.sample:345828-345829
+/branches/1.8/configs/cel_odbc.conf.sample:345828-345829,347530-347531

Propchange: tags/1.8.7.2/contrib/realtime/mysql/iaxfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  8 11:20:45 2011
@@ -1,1 +1,1 @@
-/branches/1.8/contrib/realtime/mysql/iaxfriends.sql:345828-345829
+/branches/1.8/contrib/realtime/mysql/iaxfriends.sql:345828-345829,347530-347531

Propchange: tags/1.8.7.2/contrib/realtime/mysql/meetme.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  8 11:20:45 2011
@@ -1,1 +1,1 @@
-/branches/1.8/contrib/realtime/mysql/meetme.sql:345828-345829
+/branches/1.8/contrib/realtime/mysql/meetme.sql:345828-345829,347530-347531

Propchange: tags/1.8.7.2/contrib/realtime/mysql/sipfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  8 11:20:45 2011
@@ -1,1 +1,1 @@
-/branches/1.8/contrib/realtime/mysql/sipfriends.sql:345828-345829
+/branches/1.8/contrib/realtime/mysql/sipfriends.sql:345828-345829,347530-347531

Propchange: tags/1.8.7.2/contrib/realtime/mysql/voicemail.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  8 11:20:45 2011
@@ -1,1 +1,1 @@
-/branches/1.8/contrib/realtime/mysql/voicemail.sql:345828-345829
+/branches/1.8/contrib/realtime/mysql/voicemail.sql:345828-345829,347530-347531

Propchange: tags/1.8.7.2/contrib/realtime/postgresql/realtime.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  8 11:20:45 2011
@@ -1,1 +1,1 @@
-/branches/1.8/contrib/realtime/postgresql/realtime.sql:345828-345829
+/branches/1.8/contrib/realtime/postgresql/realtime.sql:345828-345829,347530-347531

Propchange: tags/1.8.7.2/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  8 11:20:45 2011
@@ -1,3 +1,3 @@
 /be/branches/C.3/sounds/Makefile:256426
-/branches/1.8/sounds/Makefile:335714,335851,335911,345828-345829
+/branches/1.8/sounds/Makefile:335714,335851,335911,345828-345829,347530-347531
 /trunk/sounds/Makefile:270974