MFH: Change max_procs to follow library standard.

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index b11a568bac5c2504a5aeafa41519513deff3cc88..56bdc3ddc650225510140b5cf8cbf3bae4829bdd 100644 (file)
--- 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 35f505395e612867c41d358990d08dc2240d924c..994737351ed7f1efc790a7e01bc913ad112023ed 100644 (file)
--- 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 fb7750227659c35114359efa21c4afd341e47c14..5974da18b5c478eb742093055fe4d686a5eae793 100644 (file)
--- 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.