iliaa Wed Jun 18 11:19:29 2003 EDT Modified files: (Branch: PHP_4_3) /php4 php.ini-dist php.ini-recommended /php4/ext/mysql php_mysql.c Log: MFH Index: php4/php.ini-dist diff -u php4/php.ini-dist:1.171.2.14 php4/php.ini-dist:1.171.2.15 --- php4/php.ini-dist:1.171.2.14 Tue Jun 3 06:08:17 2003 +++ php4/php.ini-dist Wed Jun 18 11:19:28 2003 @@ -666,7 +666,7 @@ mysql.default_password = ; Maximum time (in secondes) for connect timeout. -1 means no limimt -mysql.connect_timeout = -1 +mysql.connect_timeout = 60 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and ; SQL-Erros will be displayed. Index: php4/php.ini-recommended diff -u php4/php.ini-recommended:1.119.2.12 php4/php.ini-recommended:1.119.2.13 --- php4/php.ini-recommended:1.119.2.12 Tue Jun 3 06:08:17 2003 +++ php4/php.ini-recommended Wed Jun 18 11:19:28 2003 @@ -681,7 +681,7 @@ mysql.default_password = ; Maximum time (in secondes) for connect timeout. -1 means no limimt -mysql.connect_timeout = -1 +mysql.connect_timeout = 60 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and ; SQL-Erros will be displayed. Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.174.2.18 php4/ext/mysql/php_mysql.c:1.174.2.19 --- php4/ext/mysql/php_mysql.c:1.174.2.18 Tue Jun 10 10:46:00 2003 +++ php4/ext/mysql/php_mysql.c Wed Jun 18 11:19:28 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.174.2.18 2003/06/10 14:46:00 andrey Exp $ */ +/* $Id: php_mysql.c,v 1.174.2.19 2003/06/18 15:19:28 iliaa Exp $ */ /* TODO: * @@ -315,7 +315,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("mysql.connect_timeout", "-1", PHP_INI_ALL, OnUpdateInt, connect_timeout, zend_mysql_globals, mysql_globals) + STD_PHP_INI_ENTRY("mysql.connect_timeout", "60", PHP_INI_ALL, OnUpdateInt, connect_timeout, zend_mysql_globals, mysql_globals) STD_PHP_INI_BOOLEAN("mysql.trace_mode", "0", PHP_INI_ALL, OnUpdateInt, trace_mode, zend_mysql_globals, mysql_globals) PHP_INI_END() /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php