fmk Mon Nov 14 18:14:27 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src php.ini-dist php.ini-recommended
/php-src/ext/mssql php_mssql.c
Log:
Change max_procs from 25 to library default. This will make FreeTDS
connections work a bit better
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.231.2.3&r2=1.231.2.4&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.231.2.3 php-src/php.ini-dist:1.231.2.4
--- php-src/php.ini-dist:1.231.2.3 Sun Nov 6 06:09:32 2005
+++ php-src/php.ini-dist Mon Nov 14 18:14:23 2005
@@ -1030,8 +1030,10 @@
; 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.
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.179.2.4&r2=1.179.2.5&ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.179.2.4
php-src/php.ini-recommended:1.179.2.5
--- php-src/php.ini-recommended:1.179.2.4 Sun Nov 6 06:09:32 2005
+++ php-src/php.ini-recommended Mon Nov 14 18:14:23 2005
@@ -1088,8 +1088,10 @@
; 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.
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.3&r2=1.152.2.4&ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.3
php-src/ext/mssql/php_mssql.c:1.152.2.4
--- php-src/ext/mssql/php_mssql.c:1.152.2.3 Sat Nov 5 21:59:18 2005
+++ php-src/ext/mssql/php_mssql.c Mon Nov 14 18:14:25 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.152.2.3 2005/11/06 02:59:18 sniper Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.4 2005/11/14 23:14:25 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -140,7 +140,7 @@
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 @@
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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
