From: Veres Lajos Date: Mon, 15 Jul 2013 21:48:06 +0000 (+0100) Subject: add a few comment X-Git-Tag: php-5.5.2RC1~13^2~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7a00a2566769399db54177afd05bfba6e0f83ef;p=php add a few comment --- diff --git a/UPGRADING b/UPGRADING index 99ab6380c1..744206787f 100755 --- a/UPGRADING +++ b/UPGRADING @@ -397,6 +397,10 @@ None - Added intl.use_exceptions INI directive, which controls what happens when global errors are set together with intl.error_level. +- MSSQL: + - mssql.compatability_mode renamed to mssql.compatibility_mode in 5.5.2, + old directive still supported for BC reasons. + - mysqlnd: - Added mysqlnd.sha256_server_public_key INI PERDIR setting that affects all APIs which use(are built) for mysqlnd. This allows diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 165dfeb1f8..d74f0829d9 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -243,6 +243,10 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY_EX("mssql.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_links, zend_mssql_globals, mssql_globals, display_link_numbers) STD_PHP_INI_ENTRY_EX("mssql.min_error_severity", "10", PHP_INI_ALL, OnUpdateLong, cfg_min_error_severity, zend_mssql_globals, mssql_globals, display_link_numbers) STD_PHP_INI_ENTRY_EX("mssql.min_message_severity", "10", PHP_INI_ALL, OnUpdateLong, cfg_min_message_severity, zend_mssql_globals, mssql_globals, display_link_numbers) + /* + mssql.compatAbility_mode (with typo) was used for relatively long time. + Unless it is fixed the old version is also kept for compatibility reasons. + */ STD_PHP_INI_BOOLEAN("mssql.compatability_mode", "0", PHP_INI_ALL, OnUpdateBool, compatibility_mode, zend_mssql_globals, mssql_globals) STD_PHP_INI_BOOLEAN("mssql.compatibility_mode", "0", PHP_INI_ALL, OnUpdateBool, compatibility_mode, zend_mssql_globals, mssql_globals) STD_PHP_INI_ENTRY_EX("mssql.connect_timeout", "5", PHP_INI_ALL, OnUpdateLong, connect_timeout, zend_mssql_globals, mssql_globals, display_link_numbers)