[svn-commits] bebuild: tag 1.8.26.0-rc2 r409148 - in /tags/1.8.26.0-rc2: ./ configs/ res/

[SVN commits to the Digium repositories]

Author: bebuild
Date: Thu Feb 27 15:24:05 2014
New Revision: 409148

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=409148
Log:
Update .version, remove summaries, merge r409052

Removed:
    tags/1.8.26.0-rc2/asterisk-1.8.26.0-rc1-summary.html
    tags/1.8.26.0-rc2/asterisk-1.8.26.0-rc1-summary.txt
Modified:
    tags/1.8.26.0-rc2/   (props changed)
    tags/1.8.26.0-rc2/.version
    tags/1.8.26.0-rc2/configs/res_fax.conf.sample
    tags/1.8.26.0-rc2/res/res_fax.c

Propchange: tags/1.8.26.0-rc2/
------------------------------------------------------------------------------
    svn:mergeinfo = /branches/1.8:409052

Modified: tags/1.8.26.0-rc2/.version
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.26.0-rc2/.version?view=diff&rev=409148&r1=409147&r2=409148
==============================================================================
--- tags/1.8.26.0-rc2/.version (original)
+++ tags/1.8.26.0-rc2/.version Thu Feb 27 15:24:05 2014
@@ -1,1 +1,1 @@
-1.8.26.0-rc1
+1.8.26.0-rc2

Modified: tags/1.8.26.0-rc2/configs/res_fax.conf.sample
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.26.0-rc2/configs/res_fax.conf.sample?view=diff&rev=409148&r1=409147&r2=409148
==============================================================================
--- tags/1.8.26.0-rc2/configs/res_fax.conf.sample (original)
+++ tags/1.8.26.0-rc2/configs/res_fax.conf.sample Thu Feb 27 15:24:05 2014
@@ -4,12 +4,12 @@
 ; Maximum Transmission Rate
 ; Possible values are { 2400 | 4800 | 7200 | 9600 | 12000 | 14400 }
 ; Set this value to the maximum desired transfer rate.  Default: 14400
-maxrate=14400
+;maxrate=14400
 
 ; Minimum Transmission Rate
 ; Possible values are { 2400 | 4800 | 7200 | 9600 | 12000 | 14400 }
-; Set this value to the minimum desired transfer rate.  Default: 2400
-minrate=2400
+; Set this value to the minimum desired transfer rate.  Default: 4800
+;minrate=4800
 
 ; Send Progress/Status events to manager session
 ; Manager events with 'call' class permissions will receive events indicating the
@@ -21,8 +21,8 @@
 ; modem capabilities
 ; Possible values are { v17 | v27 | v29 }
 ; Set this value to modify the default modem options.  Default: v17,v27,v29
-modems=v17,v27,v29
+;modems=v17,v27,v29
 
 ; Enable/disable T.30 ECM (error correction mode) by default.
 ; Default: Enabled
-ecm=yes
+;ecm=yes

Modified: tags/1.8.26.0-rc2/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.26.0-rc2/res/res_fax.c?view=diff&rev=409148&r1=409147&r2=409148
==============================================================================
--- tags/1.8.26.0-rc2/res/res_fax.c (original)
+++ tags/1.8.26.0-rc2/res/res_fax.c Thu Feb 27 15:24:05 2014
@@ -2734,6 +2734,13 @@
 		goto end;
 	}
 
+	if (options.minrate == 2400 && (options.modems & AST_FAX_MODEM_V27) && !(options.modems & (AST_FAX_MODEM_V34))) {
+		ast_fax_modem_to_str(options.modems, modems, sizeof(modems));
+		ast_log(LOG_WARNING, "'modems' setting '%s' is no longer accepted with 'minrate' setting %d\n", modems, options.minrate);
+		ast_log(LOG_WARNING, "'minrate' has been reset to 4800, please update res_fax.conf.\n");
+		options.minrate = 4800;
+	}
+
 	if (check_modem_rate(options.modems, options.minrate)) {
 		ast_fax_modem_to_str(options.modems, modems, sizeof(modems));
 		ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'minrate' setting %d\n", modems, options.minrate);