diff options
| author | Veres Lajos <vlajos@gmail.com> | 2013-07-13 13:14:54 +0100 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-21 21:12:16 -0700 |
| commit | b8941a73cce0aacdb21f04528dc0dbc3c951ab92 (patch) | |
| tree | 57d126212c70033b33f1a8adf28b0fd2f5e6282b /ext/mssql | |
| parent | 97637b2a4c1820916d6bfad510ef63cdeb563022 (diff) | |
| download | php-git-b8941a73cce0aacdb21f04528dc0dbc3c951ab92.tar.gz | |
mssql.compatability_mode fix
Diffstat (limited to 'ext/mssql')
| -rw-r--r-- | ext/mssql/php_mssql.c | 8 | ||||
| -rw-r--r-- | ext/mssql/php_mssql.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index fbeaa60ef0..bc9baaaf82 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 b73c842046..2b7d3e19c3 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; |