From 4b6be920101b00e9c50d800deaa793598fc38d15 Mon Sep 17 00:00:00 2001 From: "Frank M. Kromann" Date: Tue, 15 Nov 2005 17:33:07 +0000 Subject: [PATCH] MFH: Change max_procs to follow library standard. --- ext/mssql/php_mssql.c | 7 +++++-- php.ini-dist | 6 ++++-- php.ini-recommended | 6 ++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index b11a568bac..56bdc3ddc6 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -138,7 +138,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY_EX("mssql.batchsize", "0", PHP_INI_ALL, OnUpdateInt, batchsize, zend_mssql_globals, mssql_globals, display_link_numbers) STD_PHP_INI_BOOLEAN("mssql.datetimeconvert", "1", PHP_INI_ALL, OnUpdateBool, datetimeconvert, zend_mssql_globals, mssql_globals) STD_PHP_INI_BOOLEAN("mssql.secure_connection", "0", PHP_INI_SYSTEM, OnUpdateBool, secure_connection, zend_mssql_globals, mssql_globals) - STD_PHP_INI_ENTRY_EX("mssql.max_procs", "25", PHP_INI_ALL, OnUpdateInt, max_procs, zend_mssql_globals, mssql_globals, display_link_numbers) + STD_PHP_INI_ENTRY_EX("mssql.max_procs", "-1", PHP_INI_ALL, OnUpdateInt, max_procs, zend_mssql_globals, mssql_globals, display_link_numbers) PHP_INI_END() /* error handler */ @@ -337,7 +337,9 @@ PHP_RINIT_FUNCTION(mssql) dbsetlogintime(MS_SQL_G(connect_timeout)); if (MS_SQL_G(timeout) < 0) MS_SQL_G(timeout) = 60; dbsettime(MS_SQL_G(timeout)); - dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs)); + if (MS_SQL_G(max_procs) != -1) { + dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs)); + } return SUCCESS; } @@ -862,6 +864,7 @@ static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int off ZVAL_STRINGL(result, data, 16, 1); } break; +#endif case SQLVARBINARY: case SQLBINARY: case SQLIMAGE: { diff --git a/php.ini-dist b/php.ini-dist index 35f505395e..994737351e 100644 --- a/php.ini-dist +++ b/php.ini-dist @@ -962,8 +962,10 @@ mssql.compatability_mode = Off ; Use NT authentication when connecting to the server mssql.secure_connection = Off -; Specify max number of processes. Default = 25 -;mssql.max_procs = 25 +; Specify max number of processes. -1 = library default +; msdlib defaults to 25 +; FreeTDS defaults to 4096 +;mssql.max_procs = -1 [Assertion] ; Assert(expr); active by default. diff --git a/php.ini-recommended b/php.ini-recommended index fb77502276..5974da18b5 100644 --- a/php.ini-recommended +++ b/php.ini-recommended @@ -960,8 +960,10 @@ mssql.compatability_mode = Off ; Use NT authentication when connecting to the server mssql.secure_connection = Off -; Specify max number of processes. Default = 25 -;mssql.max_procs = 25 +; Specify max number of processes. -1 = library default +; msdlib defaults to 25 +; FreeTDS defaults to 4096 +;mssql.max_procs = -1 [Assertion] ; Assert(expr); active by default. -- 2.40.0