cvs: php-src / php.ini-dist php.ini-recommended /ext/mssql php_mssql.c
| From: | Frank M. Kromann | Date: | Mon, 14 Nov 2005 23:14:55 +0000 |
| Subject: | cvs: php-src / php.ini-dist php.ini-recommended /ext/mssql php_mssql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-35114@lists.php.net to get a copy of this message | ||
fmk Mon Nov 14 18:14:55 2005 EDT
Modified files:
/php-src php.ini-dist php.ini-recommended
/php-src/ext/mssql php_mssql.c
Log:
MFB: 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.236&r2=1.237&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.236 php-src/php.ini-dist:1.237
--- php-src/php.ini-dist:1.236 Sun Nov 6 06:08:50 2005
+++ php-src/php.ini-dist Mon Nov 14 18:14:54 2005
@@ -1039,8 +1039,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.185&r2=1.186&ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.185 php-src/php.ini-recommended:1.186
--- php-src/php.ini-recommended:1.185 Sun Nov 6 06:08:50 2005
+++ php-src/php.ini-recommended Mon Nov 14 18:14:54 2005
@@ -1096,8 +1096,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.154&r2=1.155&ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.154 php-src/ext/mssql/php_mssql.c:1.155
--- php-src/ext/mssql/php_mssql.c:1.154 Tue Nov 1 13:14:52 2005
+++ php-src/ext/mssql/php_mssql.c Mon Nov 14 18:14:54 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.154 2005/11/01 18:14:52 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.155 2005/11/14 23:14:54 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;
}