cvs: php-src(PHP_4_4) / php.ini-dist php.ini-recommended /ext/mssql php_mssql.c
| From: | Frank M. Kromann | Date: | Tue, 15 Nov 2005 17:33:07 +0000 |
| Subject: | cvs: php-src(PHP_4_4) / php.ini-dist php.ini-recommended /ext/mssql php_mssql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-35138@lists.php.net to get a copy of this message | ||
fmk Tue Nov 15 12:33:07 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src php.ini-dist php.ini-recommended
/php-src/ext/mssql php_mssql.c
Log:
MFH: Change max_procs to follow library standard.
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.171.2.28&r2=1.171.2.28.2.1&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.171.2.28 php-src/php.ini-dist:1.171.2.28.2.1
--- php-src/php.ini-dist:1.171.2.28 Thu Apr 28 09:14:45 2005
+++ php-src/php.ini-dist Tue Nov 15 12:33:04 2005
@@ -962,8 +962,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.119.2.25&r2=1.119.2.25.2.1&ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.119.2.25 php-src/php.ini-recommended:1.119.2.25.2.1
--- php-src/php.ini-recommended:1.119.2.25 Thu Apr 28 09:14:46 2005
+++ php-src/php.ini-recommended Tue Nov 15 12:33:04 2005
@@ -960,8 +960,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.86.2.44.2.3&r2=1.86.2.44.2.4&ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.3 php-src/ext/mssql/php_mssql.c:1.86.2.44.2.4
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.3 Sat Nov 5 22:06:14 2005
+++ php-src/ext/mssql/php_mssql.c Tue Nov 15 12:33:07 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.3 2005/11/06 03:06:14 sniper Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.4 2005/11/15 17:33:07 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -138,7 +138,7 @@
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 @@
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 @@
ZVAL_STRINGL(result, data, 16, 1);
}
break;
+#endif
case SQLVARBINARY:
case SQLBINARY:
case SQLIMAGE: {