From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sun, 10 Jan 2010 06:56:36 +0000 (+0000)
Subject: It's been long enough -- make the behavior introduced in 1.6 the default.
X-Git-Tag: 11.0.0-beta1~3636
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e0762370c09ddc3d835b8f7418f7d25cfd4450d;p=thirdparty%2Fasterisk.git

It's been long enough -- make the behavior introduced in 1.6 the default.


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

diff --git a/Makefile b/Makefile
index 2cae111b39..ac304dc9a5 100644
--- a/Makefile
+++ b/Makefile
@@ -745,10 +745,10 @@ samples: adsi
 		echo ";astctlgroup = apache" ; \
 		echo ";astctl = asterisk.ctl" ; \
 		echo "" ; \
-		echo "[compat]" ; \
-		echo "pbx_realtime=1.6" ; \
-		echo "res_agi=1.6" ; \
-		echo "app_set=1.6" ; \
+		echo ";[compat]" ; \
+		echo ";pbx_realtime=1.6" ; \
+		echo ";res_agi=1.6" ; \
+		echo ";app_set=1.6" ; \
 		) > $(DESTDIR)$(ASTCONFPATH) ; \
 	else \
 		echo "Skipping asterisk.conf creation"; \
diff --git a/main/asterisk.c b/main/asterisk.c
index 5509788e25..39940ebf50 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -170,7 +170,7 @@ int daemon(int, int);  /* defined in libresolv of all places */
 /*! @{ */
 
 struct ast_flags ast_options = { AST_DEFAULT_OPTIONS };
-struct ast_flags ast_compat = { 0 };
+struct ast_flags ast_compat = { 0x07 };
 
 int option_verbose;				/*!< Verbosity level */
 int option_debug;				/*!< Debug level */