From: Brian <brian@freeswitch.org>
Date: Thu, 16 Apr 2015 16:19:12 +0000 (-0500)
Subject: FS-7433
X-Git-Tag: v1.6.2~614^2~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e4385f6403a3caf1872fcc3288273db263defb2;p=thirdparty%2Ffreeswitch.git

FS-7433
---

diff --git a/conf/vanilla/autoload_configs/logfile.conf.xml b/conf/vanilla/autoload_configs/logfile.conf.xml
index 546db4abaf..8e7f6c2d71 100644
--- a/conf/vanilla/autoload_configs/logfile.conf.xml
+++ b/conf/vanilla/autoload_configs/logfile.conf.xml
@@ -22,7 +22,7 @@
 	     value is one or more of debug,info,notice,warning,err,crit,alert,all
 	     Please see comments in console.conf.xml for more information
 	-->
-	<map name="all" value="debug,info,notice,warning,err,crit,alert"/>
+	<map name="all" value="console,debug,info,notice,warning,err,crit,alert"/>
       </mappings>
     </profile>
   </profiles>
diff --git a/conf/vanilla/autoload_configs/switch.conf.xml b/conf/vanilla/autoload_configs/switch.conf.xml
index 8e66e7159f..4ffe878563 100644
--- a/conf/vanilla/autoload_configs/switch.conf.xml
+++ b/conf/vanilla/autoload_configs/switch.conf.xml
@@ -150,7 +150,7 @@
     <!-- Test each port to make sure it is not in use by some other process before allocating it to RTP -->
     <!-- <param name="rtp-port-usage-robustness" value="true"/> -->
 
-    <param name="rtp-enable-zrtp" value="true"/>
+    <param name="rtp-enable-zrtp" value="false"/>
 
     <!-- <param name="core-db-dsn" value="pgsql://hostaddr=127.0.0.1 dbname=freeswitch user=freeswitch password='' options='-c client_min_messages=NOTICE'" /> -->
     <!-- <param name="core-db-dsn" value="dsn:username:password" /> -->