[Asterisk-cvs] asterisk pbx.c,1.96.2.10,1.96.2.11

[citats at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/home/citats/cvs/asterisk-stable

Modified Files:
      Tag: v1-0_stable
	pbx.c 
Log Message:
Backport outgoing variable fix to -stable


Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.96.2.10
retrieving revision 1.96.2.11
diff -u -d -r1.96.2.10 -r1.96.2.11
--- pbx.c	22 Apr 2004 00:50:10 -0000	1.96.2.10
+++ pbx.c	17 May 2004 21:17:39 -0000	1.96.2.11
@@ -3937,6 +3937,11 @@
 		strncpy(as->exten,  exten, sizeof(as->exten) - 1);
 		as->priority = priority;
 		as->timeout = timeout;
+		if (variable) {
+			tmp = ast_strdupa(variable);
+			for (var = strtok_r(tmp, "|", &tmp); var; var = strtok_r(NULL, "|", &tmp))
+				pbx_builtin_setvar( chan, var );
+		}
 		pthread_attr_init(&attr);
 		pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 		if (pthread_create(&as->p, &attr, async_wait, as)) {
@@ -4042,6 +4047,11 @@
 		if (appdata)
 			strncpy(as->appdata,  appdata, sizeof(as->appdata) - 1);
 		as->timeout = timeout;
+		if (variable) {
+			vartmp = ast_strdupa(variable);
+			for (var = strtok_r(vartmp, "|", &vartmp); var; var = strtok_r(NULL, "|", &vartmp))
+				pbx_builtin_setvar( chan, var );
+		}
 		if (pthread_create(&as->p, NULL, async_wait, as)) {
 			ast_log(LOG_WARNING, "Failed to start async wait\n");
 			free(as);