MFB: Change max_procs from 25 to library default. This will make FreeTDS connections...

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 6333fcab18a510a70638c1354b40ddaec41c933d..52acd8a4f002178c0de2178c055c01557b2d2c84 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -140,7 +140,7 @@ PHP_INI_BEGIN()
        STD_PHP_INI_ENTRY_EX("mssql.batchsize",                         "0",    PHP_INI_ALL,    OnUpdateLong,   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,    OnUpdateLong,   max_procs,                                      zend_mssql_globals,             mssql_globals,  display_link_numbers)
+       STD_PHP_INI_ENTRY_EX("mssql.max_procs",                         "-1",   PHP_INI_ALL,    OnUpdateLong,   max_procs,                                      zend_mssql_globals,             mssql_globals,  display_link_numbers)
 PHP_INI_END()
 
 /* error handler */
@@ -341,7 +341,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;
 }

diff --git a/php.ini-dist b/php.ini-dist
index 8a281663b09afc74f8b84162dc3795e4f3e6d39a..96f47d32480cd7d345fbf1ff5f108d4d0e9ad308 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -1039,8 +1039,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 005c19ba960d6c7c3326bd228f55edd97826ef7f..0bb77ab9ffa9323da35eff0590b026ca2da8e443 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -1096,8 +1096,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.