From b8941a73cce0aacdb21f04528dc0dbc3c951ab92 Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Sat, 13 Jul 2013 13:14:54 +0100 Subject: [PATCH 1/4] mssql.compatability_mode fix --- ext/mssql/php_mssql.c | 8 ++++---- ext/mssql/php_mssql.h | 2 +- php.ini-development | 2 +- php.ini-production | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index fbeaa60ef0c..bc9baaaf82b 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -243,7 +243,7 @@ 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) - STD_PHP_INI_BOOLEAN("mssql.compatability_mode", "0", PHP_INI_ALL, OnUpdateBool, compatability_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) STD_PHP_INI_ENTRY_EX("mssql.timeout", "60", PHP_INI_ALL, OnUpdateLong, timeout, zend_mssql_globals, mssql_globals, display_link_numbers) STD_PHP_INI_ENTRY_EX("mssql.textsize", "-1", PHP_INI_ALL, OnUpdateLong, textsize, zend_mssql_globals, mssql_globals, display_text_size) @@ -415,12 +415,12 @@ static void _mssql_bind_hash_dtor(void *data) */ static PHP_GINIT_FUNCTION(mssql) { - long compatability_mode; + long compatibility_mode; mssql_globals->num_persistent = 0; mssql_globals->get_column_content = php_mssql_get_column_content_with_type; - if (cfg_get_long("mssql.compatability_mode", &compatability_mode) == SUCCESS) { - if (compatability_mode) { + if (cfg_get_long("mssql.compatibility_mode", &compatibility_mode) == SUCCESS) { + if (compatibility_mode) { mssql_globals->get_column_content = php_mssql_get_column_content_without_type; } } diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h index b73c8420462..2b7d3e19c3a 100644 --- a/ext/mssql/php_mssql.h +++ b/ext/mssql/php_mssql.h @@ -166,7 +166,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mssql) long min_error_severity, min_message_severity; long cfg_min_error_severity, cfg_min_message_severity; long connect_timeout, timeout; - zend_bool compatability_mode; + zend_bool compatibility_mode; void (*get_column_content)(mssql_link *mssql_ptr,int offset,zval *result,int column_type TSRMLS_DC); long textsize, textlimit, batchsize; zend_bool datetimeconvert; diff --git a/php.ini-development b/php.ini-development index b77d0feed63..0cb23737fe6 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1640,7 +1640,7 @@ mssql.min_error_severity = 10 mssql.min_message_severity = 10 ; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off +mssql.compatibility_mode = Off ; Connect timeout ;mssql.connect_timeout = 5 diff --git a/php.ini-production b/php.ini-production index e0ee589682a..fa16a97f08d 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1640,7 +1640,7 @@ mssql.min_error_severity = 10 mssql.min_message_severity = 10 ; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off +mssql.compatibility_mode = Off ; Connect timeout ;mssql.connect_timeout = 5 From f51b8d88208929508df39d967fae40b69eea6e1d Mon Sep 17 00:00:00 2001 From: Lajos Veres Date: Mon, 15 Jul 2013 14:05:19 +0100 Subject: [PATCH 2/4] allow both the old and new cfg argument to work. (the old of course should contain the typo) --- ext/mssql/php_mssql.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index bc9baaaf82b..165dfeb1f8f 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -243,6 +243,7 @@ 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) + 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) STD_PHP_INI_ENTRY_EX("mssql.timeout", "60", PHP_INI_ALL, OnUpdateLong, timeout, zend_mssql_globals, mssql_globals, display_link_numbers) From e7a00a2566769399db54177afd05bfba6e0f83ef Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Mon, 15 Jul 2013 22:48:06 +0100 Subject: [PATCH 3/4] add a few comment --- UPGRADING | 4 ++++ ext/mssql/php_mssql.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/UPGRADING b/UPGRADING index 99ab6380c1b..744206787f9 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 165dfeb1f8f..d74f0829d91 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) From 2c23004a1e3eb14695e6c44e52e4d5fe2a2d37d9 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sun, 21 Jul 2013 21:16:39 -0700 Subject: [PATCH 4/4] next is 5.5.2 --- configure.in | 2 +- main/php_version.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index f3a262262a3..ca5db6cabba 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 -PHP_RELEASE_VERSION=1 +PHP_RELEASE_VERSION=2 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index d4d4fe05ebb..e760d29346f 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 -#define PHP_RELEASE_VERSION 1 +#define PHP_RELEASE_VERSION 2 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.1-dev" -#define PHP_VERSION_ID 50501 +#define PHP_VERSION "5.5.2-dev" +#define PHP_VERSION_ID 50502