zak Wed Oct 9 03:34:49 2002 EDT
Modified files:
/php4/ext/mysql php_mysql.c
Log:
Set default value for mysql.connect_timeout to -1. This setting matches the setting
in php.ini-dist and ensures that the default behavior is to leave connect_timeout
alone.
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.163 php4/ext/mysql/php_mysql.c:1.164
--- php4/ext/mysql/php_mysql.c:1.163 Fri Oct 4 20:54:31 2002
+++ php4/ext/mysql/php_mysql.c Wed Oct 9 03:34:48 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.163 2002/10/05 00:54:31 mfischer Exp $ */
+/* $Id: php_mysql.c,v 1.164 2002/10/09 07:34:48 zak Exp $ */
/* TODO:
*
@@ -350,7 +350,7 @@
STD_PHP_INI_ENTRY("mysql.default_password", NULL, PHP_INI_ALL,
OnUpdateString, default_password, zend_mysql_globals,
mysql_globals)
PHP_INI_ENTRY("mysql.default_port", NULL,
PHP_INI_ALL, OnMySQLPort)
STD_PHP_INI_ENTRY("mysql.default_socket", NULL, PHP_INI_ALL,
OnUpdateStringUnempty, default_socket, zend_mysql_globals,
mysql_globals)
- STD_PHP_INI_ENTRY_EX("mysql.connect_timeout", "0", PHP_INI_SYSTEM,
OnUpdateInt, connect_timeout, zend_mysql_globals,
mysql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("mysql.connect_timeout", "-1", PHP_INI_SYSTEM,
+ OnUpdateInt, connect_timeout, zend_mysql_globals,
+mysql_globals, display_link_numbers)
PHP_INI_END()
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
